diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..de43ebf
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="examples"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="gnupg-for-java/build"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+	<classpathentry kind="output" path="build/classes"/>
+</classpath>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bc1e8f3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+*.class
+build/
+dist/
+hs_err_pid*.log
+jni/*.o
+jni/*.orig
+jni/TAGS
+# generated JNI headers
+jni/com_freiheit_gnupg_GnuPG*.h
+lib/libgnupg-for-java.so
+target/
diff --git a/.project b/.project
new file mode 100644
index 0000000..063aec5
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>gnupg-for-java</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/README.md b/README.md
index bf6fadb..48747d1 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,71 @@
-About GnuPG for Java
-=======================
+GnuPG for Java
+==============
 
-This is a lib I wrote a couple of years ago. It is a native binding to the
-gpgme library from Werner Koch. It uses JNI. 
+GnuPG for Java is a Java wrapper for the gpgme (GnuPG Made Easy) library for
+working with the GnuPG encryption suite. It is a native binding to the gpgme
+using JNI.  It requires gpgme 1.4.3 or newer, and expects to work with GnuPG
+2.x as the "engine" in gpgme.  With GnuPG 2.x, gpg-agent will handle prompting
+the user for the passphrase, as well as passphrase caching.
 
 gpgpme is the standard library for developing third-party apps on top of GnuPG.
 
-I wrote it for 32-Bit Intel GNU/Linux platforms. Some of my colleagues added
-64-Bit Intel GNU/Linux support. It should run on other Unix-platforms, too. But
-this is not tested. Also I am not aware if it runs with the current version
-of gpgme. It should be easy to add Windows support by compiling a DLL, adding
-this to the jar and extend the loading mechanism to load a DLL on a Windows platform
+Stefan Richter originally wrote it for 32-Bit Intel GNU/Linux platforms. Some
+of his colleagues added 64-Bit Intel GNU/Linux support. It should build and
+run on other UNIX platforms too, but that has not been tested.  The Guardian
+Project then ported it to GnuPG 2.x and Android as the basis of Gnu Privacy
+Guard for Android, and added lots of features and fixed lots of bugs in the
+process.
+
+It should be easy to add Windows support by compiling a DLL, adding this to
+the jar and extend the loading mechanism to load a DLL on a Windows platform
 instead of loading a .so lib.
 
 
+## Setup for Building
+
+You will need a JUnit jar to run the tests.  If your system does not provide
+one already, you can download the jar and put it into the build/ directory of
+this project.
+
+### Debian/Ubuntu/Mint/etc
+
+    sudo apt-get install default-jdk make ant build-essential \
+        libgpgme11-dev libgpg-error-dev
+
+
+### Windows
+
+* Install MinGW (for 32-bit): http://mingw.org/
+* Install Gpg4win: http://gpg4win.org/download.html
+** Signing Key Fingerprint: `61AC 3F5E E4BE 593C 13D6  8B1E 7CBD 620B EC70 B1B8`
+
+
+### Mac OS X
+
+You need to install GnuPG2 from one of a couple sources.  You can get
+it from Homebrew, MacPorts, or Fink.  Or you can install
+"GPGTools":https://gpgtools.org and then build gpgme from source.
+
+
+## Building
+
+To build the `gnupg-for-java.jar` and `libgnupg-for-java.so` in build/, run
+this:
+
+    ant clean release
+
+You can run the test suite using `ant` also:
+
+    ant test
+
+If you want the optional javadoc in build/docs/, run:
+
+    ant javadoc
+
+
+## Hacking Notes
+
+Please conform to our code format standard. For C files use
+./format-code.sh. For Java files, use Eclipse with the Android mode from the
+Android project.  The default Eclipse formatting is usually close enough.
+
diff --git a/build.properties b/build.properties
index 7534499..ed3289b 100644
--- a/build.properties
+++ b/build.properties
@@ -1,27 +1,15 @@
 # default build.properties
 
-app.name=javagnupg
-app.type=@APP-TYPE@
-app.version=0.1.5-ascii-armor-linux-i386-ia64
+app.name=gnupg-for-java
+app.version=0.2-pre
 app.customer=LGPL
 app.vendor=freiheit.com technologies gmbh
-app.year=2008
-
-lib=./lib
+app.year=2014
 
 build.compiler=modern
 compile.debug=true
 compile.deprecation=false
 compile.optimize=true
 
-#where to put the source code
-src=src
-
-#where to put the generated class files
-build=build
-
-#where to put the generated class files
-dist=dist
-
 #where to put etc stuff :-)
 etc=etc
diff --git a/build.xml b/build.xml
index cf4da56..b2d2072 100644
--- a/build.xml
+++ b/build.xml
@@ -1,105 +1,100 @@
-<project name="javagnupg" default="full-jar" basedir=".">
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="gnupg-for-java" default="release" basedir=".">
     <property file="build.properties"/>
 
+    <property name="build.dir" location="build" />
+    <property name="classes.dir" location="${build.dir}/classes" />
+    <property name="docs.dir" location="${build.dir}/docs" />
+    <property name="jarfile" value="${build.dir}/${app.name}-${app.version}.jar"/>
+
     <target name="prepare" description="Create the necessary directories and files for the build">
-        <mkdir dir="${build}"/>
-        <mkdir dir="${dist}"/>
+        <mkdir dir="${build.dir}"/>
     </target>
 
     <target name="clean" depends="clean-native" description="Remove all generated dirs and files...">
-        <delete dir="${build}"/>
-        <delete dir="${dist}"/>
+        <delete file="${jarfile}"/>
+        <delete dir="${classes.dir}" includeEmptyDirs="true"/>
     </target>
 
     <target name="compile-java" depends="prepare" description="Compile the Java code for the GnuPG-Library">
-	<javac srcdir="${src}/java" destdir="${build}" deprecation="off" debug="on">
-            <src path="${src}/java"/>
-        </javac>
-    </target>
-
-    <target name="compile-tests" depends="prepare" description="Compile the JUnit test code for the GnuPG-Library">
-	<javac srcdir="${src}/junit" destdir="${build}" deprecation="off" debug="on">
-            <classpath>
-               <pathelement location="${lib}/junit-3.8.1.jar"/>
-            </classpath>
-        </javac>
+      <mkdir dir="${classes.dir}"/>
+      <javac srcdir="src" destdir="${classes.dir}" debug="on">
+        <src path="src"/>
+      </javac>
     </target>
 
-    <target name="test" depends="gen-jni-header, compile-tests, full-jar" description="Test the library functions...">
+    <target name="test" depends="gen-jni-headers, release" description="Test the library functions...">
      	<property name="TestEnv" value="textui"/>
      	<!-- 	"textui" for text-environment
      			"swingui" for swing-environment
      		 	"awtui" for awt-environment	-->
 
+        <delete dir="/tmp/gnupg-for-java-tests"/>
+        <mkdir dir="/tmp/gnupg-for-java-tests"/>
     	<java classname="junit.${TestEnv}.TestRunner" fork ="yes">
             <classpath>
-               <pathelement location ="${basedir}/${dist}/${app.name}-${app.version}.jar"/>
-               <pathelement location="${lib}/junit-3.8.1.jar"/>
+                <fileset dir="${build.dir}" includes="*.jar"/>
+                <fileset dir="${classes.dir}"/>
             </classpath>
-            <!--classpath refid="compile.classpath"/-->
-            <arg value="com.freiheit.gnupg.GnuPGTestSuite"/>
+            <sysproperty key="java.library.path" value="${build.dir}"/>
+            <arg value="com.freiheit.gnupg.tests.GnuPGTestSuite"/>
         </java>
     </target>
 
-
-    <target name="full-jar" depends="gen-jni-library" description="Use this is you want to rebuild everything">
+    <target name="release" depends="gen-jni-library" description="Use this is you want to rebuild everything">
         <antcall target="jar"/>
     </target>
 
     <target name="jar" depends="compile-java" description="Use this, if you only want to recompile changed java code">
-    	<copydir dest="${build}" src="${src}"/>
-    	<delete failonerror="false" file="${build}/c/libjavagnupg.so"/>
-        <jar jarfile="${dist}/${app.name}-${app.version}.jar" basedir="${build}" />
+      <jar jarfile="${jarfile}" basedir="${classes.dir}" />
     </target>
-
+    
     <target name="clean-native" description="calls make clean in the c/ directory">
-        <exec executable="make" dir="${src}/c" failonerror="false">
-            <arg value="-e"/>
-            <arg value="clean"/>
-        </exec>
+      <exec executable="make" dir="jni" failonerror="false">
+        <arg value="BUILD_DIR=${build.dir}"/>
+        <arg value="clean"/>
+      </exec>
     </target>
 
     <!-- I am not using the javah-target, because it must installed additionally. -->
     <!-- Instead I am calling a separate GNUmakefile, that manages all C-related tasks -->
 
     <target name="generate-jni-headers" depends="compile-java" description="Use this, if you want to generate headers without resolving dependencies automatically">
-        <exec executable="make" dir="${src}/c" failonerror="true">
-            <arg value="header"/>
-            <arg value="-e"/>
+        <exec executable="make" dir="jni" failonerror="true">
+            <arg value="BUILD_DIR=${build.dir}"/>
+            <arg value="CLASSES_DIR=${classes.dir}"/>
+            <arg value="headers"/>
         </exec>
     </target>
 
-    <target name="gen-jni-header" depends="compile-java" description="Generate the JNI C-Header Files from the Java-Classes">
+    <target name="gen-jni-headers" depends="compile-java" description="Generate the JNI C-Header Files from the Java-Classes">
         <antcall target="generate-jni-headers"/>
     </target>
 
     <target name="recompile-c-code" description="Use this, if you just want to compile without resolving dependencies automatically">
-        <exec executable="make" dir="${src}/c" failonerror="true">
+        <exec executable="make" dir="jni" failonerror="true">
+            <arg value="BUILD_DIR=${build.dir}"/>
             <arg value="lib"/>
-            <arg value="-e"/>
         </exec>
     </target>
 
-    <target name="gen-jni-library" depends="gen-jni-header" description="Generate the Shared Library with the JNI-Binding Code">
+    <target name="gen-jni-library" depends="gen-jni-headers" description="Generate the Shared Library with the JNI-Binding Code">
         <antcall target="recompile-c-code"/>
     </target>
 
     <target name="javadoc" description="Create Javadoc-API documentation">
-        <mkdir  dir="${build}/docs/api"/>
-        <mkdir  dir="${build}/docs/images"/>
-        <copy todir="${build}/docs/images" file="etc/whitepaper.gif"/>
-        <copy todir="${build}/docs/images" file="etc/fdc.javadoc.png"/>
+        <mkdir  dir="${docs.dir}/images"/>
+        <copy todir="${docs.dir}/images" file="etc/guardianproject-logo.png"/>
+        <copy todir="${docs.dir}/images" file="etc/fdc.javadoc.png"/>
 
-        <javadoc sourcepath="${src}/java"
-                    destdir="${build}/docs/${app.name}-${app.version}"
+        <javadoc sourcepath="src"
+                    destdir="${docs.dir}/${app.name}-${app.version}"
                 windowtitle="${app.name} (Version ${app.version})"
                    doctitle="${app.name} (Version ${app.version})"
                      bottom="&#169; ${app.year} ${app.vendor}"
-                     header="freiheit.com technologies gmbh"
+                     header="freiheit.com technologies gmbh &amp; The Guardian Project"
                packagenames="com.freiheit.*"
-             stylesheetfile="${etc}/stylesheet.css"
                    overview="${etc}/overview.html">
-          <!--classpath refid="compile.classpath"/-->
             <!--
                 !!! relative path for headers does NOT work !!!
                 header="&lt;img src='../images/fdc.javadoc.png'&gt;"
@@ -110,7 +105,7 @@
     </target>
 
     <target name="zip_javadoc" depends="javadoc" description="Create a zip-file for API-Javadoc">
-        <zip zipfile="${build}/${app.name}-${app.version}-javadoc.zip" basedir="${build}/docs/${app.name}-${app.version}"/>
+        <zip zipfile="build/${app.name}-${app.version}-javadoc.zip" basedir="${docs.dir}/${app.name}-${app.version}"/>
     </target>
 
 </project>
diff --git a/c-test-code/oerks.c b/c-test-code/oerks.c
deleted file mode 100644
index e5dfd1b..0000000
--- a/c-test-code/oerks.c
+++ /dev/null
@@ -1,74 +0,0 @@
-#include <gpgme.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-/*
- * Test for the gpgme gen key function. This function seems
- * to hang from time to time.
- */
-
-static int progress_called;
-
-static void
-progress (void *self, const char *what, int type, int current, int total)
-{
-  if (!strcmp (what, "primegen") && !current && !total
-      && (type == '.' || type == '+' || type == '!'
-          || type == '^' || type == '<' || type == '>'))
-    {
-      printf ("%c", type);
-      fflush (stdout);
-      progress_called = 1;
-    }
-  else
-    {
-      fprintf (stderr, "unknown progress `%s' %d %d %d\n", what, type,
-               current, total);
-      exit (1);
-    }
-}
-
-int
-main (int argc, char *argv[])
-{
-  gpgme_ctx_t ctx;
-  gpgme_error_t err;
-  char *p = "<GnupgKeyParms format=\"internal\">\n" \
-            "Key-Type: DSA\n" \
-            "Key-Length: 1024\n" \
-            "Subkey-Type: ELG-E\n" \
-            "Subkey-Length: 1024\n" \
-            "Name-Real: alpha\n" \
-            "Name-Comment: just a test\n" \
-            "Name-Email: alpha@alpha.org\n" \
-            "Expire-Date: 0\n" \
-            "Passphrase: alpha\n" \
-            "</GnupgKeyParms>";
-  char *home = "/tmp/gnupg";
-
-  if (argc > 1)
-    {
-      home = argv[1];
-    }
-
-  err = gpgme_new (&ctx);
-  //fprintf(stderr, "gpgme_new, result: %d\n", err);
-  //gpgme_set_armor (ctx, 1);
-  //fprintf(stderr, "gpgme_set_armor, result: %d\n", err);
-  //gpgme_set_textmode (ctx, 1);
-  //fprintf(stderr, "gpgme_set_textmode, result: %d\n", err);
-  //err = gpgme_set_keylist_mode (ctx, GPGME_KEYLIST_MODE_LOCAL | GPGME_KEYLIST_MODE_SIGS);
-  //fprintf(stderr, "gpgme_set_keylist_mode, result: %d\n", err);
-  fprintf (stderr, "set home to \"%s\"\n", home);
-  err = gpgme_ctx_set_engine_info (ctx, 0, "/usr/bin/gpg", home);
-  fprintf(stderr, "gpgme_set_engine_info, result: %d\n", err);
-
-  fprintf(stderr, "starting genkey: \"%s\"\n", p);
-
-  gpgme_set_progress_cb (ctx, progress, NULL);
-  err = gpgme_op_genkey(ctx, p, NULL, NULL);
-
-  fprintf(stderr, "done, result: %d\n", err);
-
-  return 0;
-}
diff --git a/etc/guardianproject-logo.png b/etc/guardianproject-logo.png
new file mode 100644
index 0000000..4a2936b
Binary files /dev/null and b/etc/guardianproject-logo.png differ
diff --git a/etc/stylesheet.css b/etc/stylesheet.css
deleted file mode 100644
index 481f3a7..0000000
--- a/etc/stylesheet.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Javadoc style sheet */
-
-/* Define colors, fonts and other style attributes here to override the defaults */
-
-/* Page background color */
-body {  background-color: #FFFFFF;
-        background-image:url(../images/whitepaper.gif); 
-        background-repeat:repeat-y;
-        background-attachment:fixed; 
-        font-family: Arial, Helvetica, sans-serif;
-     }
-
-table { border-color: #000000; }
-
-a:active  {color: #cad3a0; text-decoration: none}
-a:hover   {color: #cad3a0; text-decoration: none}
-a:link    {color: #999900; text-decoration: none}
-a:visited {color: #888800; text-decoration: none}
-
-/* Table colors */
-.TableHeadingColor     { background: #999900 } /* Dark green */
-.TableSubHeadingColor  { background: #EEEED5 } /* Light green */
-.TableRowColor         { background: #FFFFFF } /* White */
-
-/* Font used in left-hand frame lists */
-.FrameTitleFont   { font-size: 10pts; font-family: Helvetica, Arial, san-serif }
-.FrameHeadingFont { font-size: 10pts; font-family: Helvetica, Arial, san-serif }
-.FrameItemFont    { font-size: 10pts; font-family: Helvetica, Arial, san-serif }
-
-/* Example of smaller, sans-serif font in frames */
-/* .FrameItemFont  { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */
-
-/* Navigation bar fonts and colors */
-.NavBarCell1    { background-color:#EEEED5;}/* Light green */
-.NavBarCell1Rev { background-color:#999900;}/* Dark green  */
-.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;}
-.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
-
-.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-
diff --git a/etc/whitepaper.gif b/etc/whitepaper.gif
deleted file mode 100644
index d90f594..0000000
Binary files a/etc/whitepaper.gif and /dev/null differ
diff --git a/examples/run.sh b/examples/run.sh
new file mode 100755
index 0000000..7d67f66
--- /dev/null
+++ b/examples/run.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+projectroot=`pwd`/..
+
+if [ ! -e KeySearch.class ]; then
+    javac -classpath $projectroot/src KeySearch.java
+fi
+
+java -Djava.library.path=$projectroot/lib \
+    -classpath ../build/jar/gnupg-for-java-0.2-pre.jar:. \
+    KeySearch
diff --git a/jni/GNUmakefile b/jni/GNUmakefile
new file mode 100755
index 0000000..8588bc9
--- /dev/null
+++ b/jni/GNUmakefile
@@ -0,0 +1,96 @@
+
+JNI_SOURCES := GnuPGContext.c GnuPGData.c GnuPGGenkeyResult.c GnuPGKey.c GnuPGSignature.c
+JNI_CLASSES := $(patsubst %.c, com.freiheit.gnupg.%, $(JNI_SOURCES))
+JNI_HEADERS := $(patsubst %.c, com_freiheit_gnupg_%.h, $(JNI_SOURCES))
+SOURCES := $(JNI_SOURCES) gpgmeutils.c
+OBJECTS := $(SOURCES:.c=.o)
+
+DEBUG := -g
+ALL_CFLAGS := -Werror -Wall -Wno-deprecated-declarations -fPIC
+ALL_CPPFLAGS = -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 \
+	-I"$(JAVA_HOME)/include"
+
+
+# these are provided by ant
+ifeq (,$(BUILD_DIR))
+$(error Run the native builds using ant, i.e. `ant gen-jni-library`)
+endif
+
+UNAME := $(shell uname -s)
+ifeq (MINGW,$(findstring MINGW,$(UNAME)))
+  CC := mingw32-gcc
+  ALL_CFLAGS +=  -mms-bitfields -Wl,--add-stdcall-alias
+  ALL_CPPFLAGS += -I"$(JAVA_HOME)/include/win32" -I"$(PROGRAMFILES)/GNU/GnuPG/include"
+  ALL_LDFLAGS :=  -s -shared -Wl,--enable-auto-import
+  ALL_LIBS := -L"$(PROGRAMFILES)/GNU/GnuPG" -lgpgme-11
+  JAVA_HOME := $(PROGRAMFILES)/Java/jdk1.7.0_51
+  GNUPG_LIB := $(BUILD_DIR)/gnupg-for-java.dll
+else
+  ifeq ($(UNAME),Darwin)
+    CC := gcc
+    ALL_CPPFLAGS += -I/usr/local/MacGPG2/include
+    ALL_LDFLAGS := -dylib
+    ALL_LIBS := -L/usr/local/MacGPG2/lib -framework MacGPGME
+    JAVA_HOME := $(shell /usr/libexec/java_home \
+	|| echo /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home)
+    GNUPG_LIB := $(BUILD_DIR)/libgnupg-for-java.dylib
+  else
+    CC := gcc
+    ALL_CFLAGS +=  $(shell gpgme-config --cflags)
+    ALL_CPPFLAGS += -I"$(JAVA_HOME)/include/linux"
+    ALL_LDFLAGS := -shared
+    ALL_LIBS := $(shell gpgme-config --thread=pthread --libs)
+    GNUPG_LIB := $(BUILD_DIR)/libgnupg-for-java.so
+    # to override this JAVA_HOME, use the `-e' flag to make, or call it like:
+    #   make JAVA_HOME=/opt/java
+    JAVA_HOME := $(shell readlink -f /usr/bin/javac | sed "s:/bin/javac::")
+  endif
+endif
+
+ALL_CFLAGS := $(ALL_CFLAGS) $(CFLAGS)
+ALL_LDFLAGS := $(LDFLAGS) $(ALL_LDFLAGS)
+ALL_LIBS := $(LIBS) $(ALL_LIBS)
+
+
+JAVAP := $(JAVA_HOME)/bin/javap
+JAVAH := $(JAVA_HOME)/bin/javah
+JAVA  := $(JAVA_HOME)/bin/java
+
+INSTALL := install -m 644
+
+
+$(GNUPG_LIB): $(OBJECTS)
+	$(CC) $(DEBUG) $(ALL_CFLAGS) $(ALL_LDFLAGS) $^ -o $@ $(ALL_LIBS)
+
+$(OBJECTS): $(JNI_HEADERS) $(SOURCES) gpgmeutils.h
+
+%.o: %.c
+	$(CC) $(DEBUG) $(ALL_CFLAGS) $(ALL_CPPFLAGS) -c $<
+
+lib: $(GNUPG_LIB)
+
+headers: $(JNI_HEADERS)
+
+$(JNI_HEADERS):
+	$(JAVAH) -classpath $(CLASSES_DIR) -jni $(JNI_CLASSES)
+
+mids:
+	$(JAVAP) -classpath $(CLASSES_DIR) -s -p $(JNI_CLASSES)
+
+clean:
+	rm -f $(OBJECTS) *~
+	rm -f $(GNUPG_LIB)
+	rm -f $(JNI_HEADERS)
+
+test:
+	echo "JAVA_HOME: --$(JAVA_HOME)--"
+	echo "JNI_SOURCES: $(JNI_SOURCES)"
+	echo "JNI_CLASSES: $(JNI_CLASSES)"
+	echo "JNI_HEADERS: $(JNI_HEADERS)"
+	echo "SOURCES: $(SOURCES)"
+
+TAGS:
+	etags *.c *.h
+
+
+.PHONY: lib header mids clean test
diff --git a/jni/GnuPGContext.c b/jni/GnuPGContext.c
new file mode 100644
index 0000000..79e3234
--- /dev/null
+++ b/jni/GnuPGContext.c
@@ -0,0 +1,834 @@
+#include <jni.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include <locale.h>
+#include <gpgme.h>
+
+#include "gpgmeutils.h"
+#include "com_freiheit_gnupg_GnuPGContext.h"
+
+JavaVM* _jvm;
+
+
+JNIEXPORT jint JNICALL
+JNI_OnLoad(JavaVM* vm, void* reserved)
+{
+    _jvm = vm;
+
+    // this is required to setup gpgme properly, otherwise it crashes
+    // https://www.gnupg.org/documentation/manuals/gpgme/Multi-Threading.html
+    gpgme_check_version("1.5.0");
+
+    // TODO set locale from the JavaVM's config
+    setlocale(LC_ALL, "");
+    gpgme_set_locale(NULL, LC_CTYPE, setlocale(LC_CTYPE, NULL));
+#ifdef LC_MESSAGES
+    gpgme_set_locale(NULL, LC_MESSAGES, setlocale(LC_MESSAGES, NULL));
+#endif
+
+    return JNI_VERSION_1_6;
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeGetEngineInfo(JNIEnv* env, jobject self)
+{
+    gpgme_engine_info_t engineInfo;
+    gpgme_get_engine_info(&engineInfo);
+
+    jclass cls = (*env)->GetObjectClass(env, self);
+
+    UTILS_setStringMember(env, self, cls, "_version", engineInfo->version);
+    UTILS_setStringMember(env, self, cls, "_filename", engineInfo->file_name);
+    UTILS_setStringMember(env, self, cls, "_reqversion",
+                          engineInfo->req_version);
+    UTILS_setIntMember(env, self, cls, "_protocol", engineInfo->protocol);
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeNew(JNIEnv* env, jobject self)
+{
+    gpgme_ctx_t ctx;
+    gpgme_new(&ctx);
+    gpgme_set_armor(ctx, 1);
+    gpgme_set_textmode(ctx, 1);
+    gpgme_set_keylist_mode(ctx, GPGME_KEYLIST_MODE_LOCAL);
+
+    return LNG(ctx);
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpEncrypt(JNIEnv* env,
+        jobject self,
+        jlong context,
+        jlongArray recipients,
+        jlong plain,
+        jlong cipher)
+{
+    gpgme_error_t err;
+
+    //how many keys from recipients did we receive?
+    jsize len = (*env)->GetArrayLength(env, recipients);
+
+    //allocate a new array with one field larger then number of recipient keys
+    gpgme_key_t keys[len + 1];  //allowed in C99 Standard...and useful!!!
+
+    // disabled on werners behalf (33% of the work)
+    // overriden bei sebastian.mangels@freiheit.com,
+    // we need ascii armor.
+    //gpgme_set_armor( CONTEXT(context), 0 );
+
+    if (UTILS_copyRecipientsFromJvm(env, recipients, keys) < 1) {
+        return;
+    }
+
+    err = gpgme_data_rewind(DATA(plain));   //TODO: Use seek instead of rewind
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+    err = gpgme_data_rewind(DATA(cipher));   //TODO: Use seek instead of rewind
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+    //call gpgme library function for encryption
+    err = gpgme_op_encrypt(CONTEXT(context), keys, GPGME_ENCRYPT_ALWAYS_TRUST,
+                           DATA(plain), DATA(cipher));
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+    /*   err = gpgme_op_encrypt_start(CONTEXT(context), keys, GPGME_ENCRYPT_ALWAYS_TRUST, (gpgme_data_t)plain, (gpgme_data_t)cipher); */
+    /*   if(UTILS_onErrorThrowException(env, err)){ */
+    /*     return; */
+    /*   } */
+    /*   gpgme_ctx_t waitedOn = gpgme_wait(CONTEXT(context), err, 1);//HANG UNTIL COMPLETED! */
+    /*   if(waitedOn != NULL && UTILS_onErrorThrowException(env, err)){ */
+    /*     return; */
+    /*   } */
+
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpDecrypt(JNIEnv* env,
+        jobject self,
+        jlong context,
+        jlong cipher,
+        jlong plain)
+{
+    gpgme_error_t err;
+
+    err = gpgme_data_rewind(DATA(cipher));   //TODO: Use seek instead of rewind
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+    err = gpgme_data_rewind(DATA(plain));   //TODO: Use seek instead of rewind
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+    err = gpgme_op_decrypt(CONTEXT(context), DATA(cipher), DATA(plain));
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+    /*   err = gpgme_op_decrypt_start(CONTEXT(context), (gpgme_data_t)cipher, (gpgme_data_t)plain); */
+    /*   if(UTILS_onErrorThrowException(env, err)){ */
+    /*     return; */
+    /*   } */
+    /*   gpgme_ctx_t waitedOn = gpgme_wait(CONTEXT(context), err, 1);//HANG UNTIL COMPLETED! */
+    /*   if(waitedOn != NULL && UTILS_onErrorThrowException(env, err)){ */
+    /*     return; */
+    /*   } */
+}
+
+static void flush_data(gpgme_data_t dh)
+{
+    char buf[100];
+    int ret;
+
+    ret = gpgme_data_seek(dh, 0, SEEK_SET);
+
+    while ((ret = gpgme_data_read(dh, buf, 100)) > 0)
+        fwrite(buf, ret, 1, stdout);
+
+}
+
+
+gpgme_error_t
+edit_fnc(void* opaque, gpgme_status_code_t status, const char* args, int fd)
+{
+    char* result = NULL;
+    gpgme_data_t out = (gpgme_data_t)opaque;
+
+    fputs("[-- Response --]\n", stdout);
+    flush_data(out);
+
+    fprintf(stdout, "[-- Code: %i, %s --]\n", status, args);
+
+    if (fd >= 0) {
+        if (!strcmp(args, "keyedit.prompt")) {
+            static int switcher = 0;
+
+            if (!switcher) {
+                result = "passwd";
+                switcher++;
+            } else {
+                result = "save";
+                switcher--;
+            }
+
+        } else if (!strcmp(args, "keyedit.save.okay")) {
+            result = "Y";
+        } else if (!strcmp(args, "keygen.valid")) {
+            result = "0";
+        } else if (!strcmp(args, "change_passwd.empty.okay")) {
+            result = "N";
+        }
+    }
+
+    if (result) {
+        fprintf(stdout, "[-- Command: %s --]\n", result);
+        write(fd, result, strlen(result));
+        write(fd, "\n", 1);
+    }
+    return 0;
+}
+
+
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpChangePassphrase(JNIEnv* env,
+        jobject self,
+        jlong context,
+        jlong keydata)
+{
+    gpgme_error_t err;
+
+    err = gpgme_op_passwd(CONTEXT(context), KEY(keydata), 0);
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeRelease(JNIEnv* env,
+        jobject self,
+        jlong context)
+{
+    gpgme_release(CONTEXT(context));
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpEncryptSign(JNIEnv* env,
+        jobject self,
+        jlong context,
+        jlongArray recipients,
+        jlong plain,
+        jlong cipher)
+{
+    gpgme_error_t err;
+
+    jsize len = (*env)->GetArrayLength(env, recipients);
+    gpgme_key_t keys[len + 1];
+    if (UTILS_copyRecipientsFromJvm(env, recipients, keys) < 1) {
+        return;
+    }
+
+    err = gpgme_data_rewind(DATA(plain));   //TODO: Use seek instead of rewind
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+    err = gpgme_data_rewind(DATA(cipher));   //TODO: Use seek instead of rewind
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+    err = gpgme_op_encrypt_sign(CONTEXT(context), keys,
+                                GPGME_ENCRYPT_ALWAYS_TRUST, DATA(plain),
+                                DATA(cipher));
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+    /*   err = gpgme_op_encrypt_sign_start(CONTEXT(context), keys, GPGME_ENCRYPT_ALWAYS_TRUST, (gpgme_data_t)plain, (gpgme_data_t)cipher); */
+    /*   if(UTILS_onErrorThrowException(env, err)){ */
+    /*     return; */
+    /*   } */
+    /*   gpgme_ctx_t waitedOn = gpgme_wait(CONTEXT(context), err, 1);//HANG UNTIL COMPLETED! */
+    /*   if(waitedOn != NULL && UTILS_onErrorThrowException(env, err)){ */
+    /*     return; */
+    /*   } */
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpDecryptVerify(JNIEnv* env,
+        jobject self,
+        jlong context,
+        jlong cipher,
+        jlong plain)
+{
+    gpgme_error_t err;
+
+    err = gpgme_data_rewind(DATA(cipher));   //TODO: Use seek instead of rewind
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+    err = gpgme_data_rewind(DATA(plain));   //TODO: Use seek instead of rewind
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+    err = gpgme_op_decrypt_verify(CONTEXT(context), DATA(cipher), DATA(plain));
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+    /*   err = gpgme_op_decrypt_verify_start(CONTEXT(context), (gpgme_data_t)cipher, (gpgme_data_t)plain); */
+    /*   if(UTILS_onErrorThrowException(env, err)){ */
+    /*     return; */
+    /*   } */
+    /*   gpgme_ctx_t waitedOn = gpgme_wait(CONTEXT(context), err, 1);//HANG UNTIL COMPLETED! */
+    /*   if(waitedOn != NULL && UTILS_onErrorThrowException(env, err)){ */
+    /*     return; */
+    /*   } */
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpSign(JNIEnv* env,
+        jobject self,
+        jlong context,
+        jlong plain,
+        jlong signature)
+{
+    gpgme_error_t err;
+
+    err = gpgme_data_rewind(DATA(plain));   //TODO: Use seek instead of rewind
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+    err = gpgme_data_rewind(DATA(signature));   //TODO: Use seek instead of rewind
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+    err = gpgme_op_sign(CONTEXT(context), DATA(plain), DATA(signature),
+                        GPGME_SIG_MODE_CLEAR);
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+    /*   err = gpgme_op_sign_start(CONTEXT(context), (gpgme_data_t)plain, (gpgme_data_t)signature, GPGME_SIG_MODE_NORMAL); */
+    /*   if(UTILS_onErrorThrowException(env, err)){ */
+    /*     return; */
+    /*   } */
+
+    /*   gpgme_ctx_t waitedOn = gpgme_wait(CONTEXT(context), err, 0); */
+    /*   if(waitedOn != NULL && UTILS_onErrorThrowException(env, err)){ */
+    /*     return; */
+    /*   } */
+
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpVerify(JNIEnv* env,
+        jobject self,
+        jlong context,
+        jlong signature,
+        jlong signedtxt,
+        jlong plain)
+{
+    gpgme_error_t err;
+
+    err = gpgme_data_rewind(DATA(signature));   //TODO: Use seek instead of rewind
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+    err = gpgme_data_rewind(DATA(signedtxt));   //TODO: Use seek instead of rewind
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+    err = gpgme_data_rewind(DATA(plain));   //TODO: Use seek instead of rewind
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+    err = gpgme_op_verify(CONTEXT(context), DATA(signature), DATA(signedtxt),
+                          DATA(plain));
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+    /*   err = gpgme_op_verify_start(CONTEXT(context), (gpgme_data_t)signature, (gpgme_data_t)signedtxt, (gpgme_data_t)plain); */
+    /*   if(UTILS_onErrorThrowException(env, err)){ */
+    /*     return; */
+    /*   } */
+    /*   gpgme_ctx_t waitedOn = gpgme_wait(CONTEXT(context), err, 0); */
+    /*   if(waitedOn != NULL && UTILS_onErrorThrowException(env, err)){ */
+    /*     return; */
+    /*   } */
+}
+
+JNIEXPORT jobjectArray JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeKeylist(JNIEnv* env,
+        jobject self,
+        jlong context,
+        jstring query,
+        jboolean secret_only)
+{
+    //copy string object from java to native string
+    const jsize query_len = (*env)->GetStringLength(env, query);
+    const jbyte* query_str = (jbyte*)(*env)->GetStringUTFChars(env, query,
+                             NULL);
+    //get the right constructor to invoke for every key in result set
+    jclass keyClass;
+    keyClass = (*env)->FindClass(env, "com/freiheit/gnupg/GnuPGKey");
+    if (keyClass == NULL) {
+        return NULL;
+    }
+    jmethodID cid;
+    //get the constructor, that accepts a long as param (that is a ptr to a key)..
+    cid = (*env)->GetMethodID(env, keyClass, "<init>", "(J)V");
+    if (cid == NULL) {
+        return NULL;
+    }
+
+    gpgme_error_t err = gpgme_op_keylist_start(CONTEXT(context),
+                        query_len > 0 ? (const char*)query_str : NULL, secret_only);
+    if (UTILS_onErrorThrowException(env, err)) {
+        (*env)->ReleaseStringUTFChars(env, query, (const char*)query_str);
+        return NULL;
+    }
+
+    gpgme_key_t key;
+    jlong num_keys_found = 0;
+    struct _keyInList {
+        gpgme_key_t key;
+        struct _keyInList* next;
+    };
+    typedef struct _keyInList* keyInList;
+    keyInList current, next, head = NULL;
+    while (!err) {
+        err = gpgme_op_keylist_next(CONTEXT(context), &key);
+        if ((gpg_err_code(err) != GPG_ERR_EOF)
+                && UTILS_onErrorThrowException(env, err)) {
+            return NULL;
+        } else if (err) {
+            break; // we have nothing, quit before setting the list
+        }
+        current = (keyInList)malloc(sizeof(keyInList));
+        current->key = key;
+        current->next = head;
+        head = current;
+        num_keys_found++;
+    }
+    current = head;
+    jobject keyObj = NULL;
+    jobjectArray result = (*env)->NewObjectArray(env,
+                          num_keys_found,
+                          keyClass,
+                          NULL);
+    int i;
+    for (i = 0; i < num_keys_found; i++) {
+        key = current->key;
+        keyObj = (*env)->NewObject(env, keyClass, cid, LNG(key));
+        (*env)->SetObjectArrayElement(env, result, i, keyObj);
+        next = current->next;
+        free(current);
+        current = next;
+    }
+
+    //..and release the query string for gc..
+    (*env)->ReleaseStringUTFChars(env, query, (const char*) query_str);
+
+    return result;
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeAddSigners(JNIEnv* env,
+        jobject self,
+        jlong context,
+        jlong key)
+{
+    gpgme_error_t err;
+    err = gpgme_signers_add(CONTEXT(context), KEY(key));
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeClearSigners(JNIEnv* env,
+        jobject self,
+        jlong context)
+{
+    gpgme_signers_clear(CONTEXT(context));
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeGetSigner(JNIEnv* env,
+        jobject self,
+        jlong context,
+        jint index)
+{
+    gpgme_key_t key = gpgme_signers_enum(CONTEXT(context), index);
+    return LNG(key);
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeGetSignersLength(JNIEnv* env,
+        jobject self,
+        jlong context)
+{
+    return (gpgme_signers_count(CONTEXT(context)));
+}
+
+void check_result(gpgme_import_result_t result, char* fpr, int secret)
+{
+    //TODO: Throw exception for possible errors...
+    if (result->considered != 1) {
+        fprintf(stderr, "Unexpected number of considered keys %i\n",
+                result->considered);
+    }
+
+    if (result->no_user_id != 0) {
+        fprintf(stderr, "Unexpected number of user ids %i\n",
+                result->no_user_id);
+    }
+
+    if ((secret && result->imported != 0)
+            || (!secret && (result->imported != 0 && result->imported != 1))) {
+        fprintf(stderr, "Unexpected number of imported keys %i\n",
+                result->imported);
+    }
+
+    if (result->imported_rsa != 0) {
+        fprintf(stderr, "Unexpected number of imported RSA keys %i\n",
+                result->imported_rsa);
+    }
+
+    if ((secret && result->unchanged != 0)
+            || (!secret && ((result->imported == 0 && result->unchanged != 1)
+                            || (result->imported == 1 && result->unchanged != 0)))) {
+        fprintf(stderr, "Unexpected number of unchanged keys %i\n",
+                result->unchanged);
+    }
+
+    if (result->new_user_ids != 0) {
+        fprintf(stderr, "Unexpected number of new user IDs %i\n",
+                result->new_user_ids);
+    }
+
+    if (result->new_sub_keys != 0) {
+        fprintf(stderr, "Unexpected number of new sub keys %i\n",
+                result->new_sub_keys);
+    }
+
+    if ((secret
+            && ((result->secret_imported == 0 && result->new_signatures != 0)
+                || (result->secret_imported == 1 && result->new_signatures > 1)))
+            || (!secret && result->new_signatures != 0)) {
+        fprintf(stderr, "Unexpected number of new signatures %i\n",
+                result->new_signatures);
+        if (result->new_signatures == 2) {
+            fprintf(stderr, "### ignored due to gpg 1.3.4 problems\n");
+        } else {
+            //exit (1);
+        }
+    }
+
+    if (result->new_revocations != 0) {
+        fprintf(stderr, "Unexpected number of new revocations %i\n",
+                result->new_revocations);
+    }
+
+    if ((secret && result->secret_read != 1)
+            || (!secret && result->secret_read != 0)) {
+        fprintf(stderr, "Unexpected number of secret keys read %i\n",
+                result->secret_read);
+    }
+
+    if ((secret && result->secret_imported != 0 && result->secret_imported != 1)
+            || (!secret && result->secret_imported != 0)) {
+        fprintf(stderr, "Unexpected number of secret keys imported %i\n",
+                result->secret_imported);
+    }
+
+    if ((secret
+            && ((result->secret_imported == 0 && result->secret_unchanged != 1)
+                || (result->secret_imported == 1
+                    && result->secret_unchanged != 0)))
+            || (!secret && result->secret_unchanged != 0)) {
+        fprintf(stderr, "Unexpected number of secret keys unchanged %i\n",
+                result->secret_unchanged);
+    }
+
+    if (result->not_imported != 0) {
+        fprintf(stderr, "Unexpected number of secret keys not imported %i\n",
+                result->not_imported);
+    }
+
+    if (secret) {
+        if (!result->imports
+                || (result->imports->next && result->imports->next->next)) {
+            fprintf(stderr, "Unexpected number of status reports\n");
+        }
+    } else if (!result->imports || result->imports->next) {
+        fprintf(stderr, "Unexpected number of status reports\n");
+    }
+
+    if (strcmp(fpr, result->imports->fpr)) {
+        fprintf(stderr, "Unexpected fingerprint %s\n", result->imports->fpr);
+    }
+
+    if (result->imports->next && strcmp(fpr, result->imports->next->fpr)) {
+        fprintf(stderr, "Unexpected fingerprint on second status %s\n",
+                result->imports->next->fpr);
+    }
+
+    if (result->imports->result != 0) {
+        fprintf(stderr, "Unexpected status result %s\n",
+                gpgme_strerror(result->imports->result));
+    }
+
+    if (secret) {
+        if (result->secret_imported == 0) {
+            if (result->imports->status != GPGME_IMPORT_SECRET) {
+                fprintf(stderr, "Unexpected status %i\n",
+                        result->imports->status);
+            }
+        } else if (result->imports->status
+                   != (GPGME_IMPORT_SECRET | GPGME_IMPORT_NEW)
+                   || (result->imports->next
+                       && result->imports->next->status != GPGME_IMPORT_SIG)) {
+            fprintf(stderr, "Unexpected status %i\n", result->imports->status);
+        }
+    } else if ((result->imported == 0 && result->imports->status != 0)
+               || (result->imported == 1
+                   && result->imports->status != GPGME_IMPORT_NEW)) {
+        fprintf(stderr, "Unexpected status %i\n", result->imports->status);
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpImport(JNIEnv* env,
+        jobject self,
+        jlong context,
+        jlong keydata)
+{
+    gpgme_error_t err;
+    gpgme_import_result_t result;
+
+    err = gpgme_data_rewind(DATA(keydata));   //TODO: Use seek instead of rewind
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+    err = gpgme_op_import(CONTEXT(context), DATA(keydata));
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+    result = gpgme_op_import_result(CONTEXT(context));
+    if (result == NULL) {
+        if (UTILS_onErrorThrowException(env, GPG_ERR_NO_PUBKEY))
+            return;
+    } else if (result->imported != 1 || result->not_imported != 0) {
+        if (result->imports == NULL) {
+            if (UTILS_onErrorThrowException(env, GPG_ERR_UNUSABLE_PUBKEY)) {
+                return;
+            }
+        } else {
+            if (UTILS_onErrorThrowException(env, result->imports->result)) {
+                return;
+            }
+        }
+    }
+    //TODO: Check result and throw exceptions
+    //check_result (result, "ADAB7FCC1F4DE2616ECFA402AF82244F9CD9FD55", 0);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeGetArmor(JNIEnv* env,
+        jobject self,
+        jlong context)
+{
+    return (jboolean) gpgme_get_armor(CONTEXT(context));
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeSetArmor(JNIEnv* env,
+        jobject self,
+        jlong context,
+        jboolean armor_state)
+{
+    gpgme_set_armor(CONTEXT(context), (int) armor_state);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeGetTextmode(JNIEnv* env,
+        jobject self,
+        jlong context)
+{
+    return (jboolean) gpgme_get_textmode(CONTEXT(context));
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeSetTextmode(JNIEnv* env,
+        jobject self,
+        jlong context,
+        jboolean mode)
+{
+    gpgme_set_textmode(CONTEXT(context), (int) mode);
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpGenKey(JNIEnv* env,
+        jobject self,
+        jlong context,
+        jstring params)
+{
+
+    gpgme_ctx_t ctx = CONTEXT(context);
+    char* p;
+    gpgme_error_t err;
+
+    p = (char*)(*env)->GetStringUTFChars(env, params, NULL);
+
+    fprintf(stderr, "genKey: \"%s\"\n", p);
+
+    err = gpgme_op_genkey(ctx, p, NULL, NULL);
+
+    (*env)->ReleaseStringUTFChars(env, params, p);
+
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+}
+
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpExport(JNIEnv* env,
+        jobject self,
+        jlong context,
+        jstring pattern,
+        jlong reserved,
+        jlong keydata)
+{
+
+    gpgme_ctx_t ctx = CONTEXT(context);
+    char* p;
+    gpgme_data_t data = DATA(keydata);
+    gpgme_error_t err;
+
+
+    p = (char*)(*env)->GetStringUTFChars(env, pattern, NULL);
+    err = gpgme_op_export(ctx, p, 0, data);
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+    (*env)->ReleaseStringUTFChars(env, pattern, p);
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeCtxSetEngineInfo(JNIEnv* env,
+        jobject self,
+        jlong ctx,
+        jint proto,
+        jstring fileName,
+        jstring homeDir)
+{
+
+    gpgme_ctx_t context = CONTEXT(ctx);
+    gpgme_protocol_t protocol = (gpgme_protocol_t) proto;
+    char* file_name;
+    char* home_dir;
+    gpgme_error_t err;
+
+    file_name = (char*)(*env)->GetStringUTFChars(env, fileName, NULL);
+    home_dir = (char*)(*env)->GetStringUTFChars(env, homeDir, NULL);
+
+
+    /*fprintf(stderr, "set engine info: proto: %d, fileName: %s, homeDir: %s\n", proto, file_name, home_dir);*/
+    err = gpgme_ctx_set_engine_info(context, protocol, file_name, home_dir);
+
+    (*env)->ReleaseStringUTFChars(env, fileName, file_name);
+    (*env)->ReleaseStringUTFChars(env, homeDir, home_dir);
+
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+}
+
+
+JNIEXPORT jobject JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpGenkeyResult(JNIEnv* env,
+        jobject self,
+        jlong ctx)
+{
+
+    gpgme_ctx_t context = CONTEXT(ctx);
+    gpgme_genkey_result_t result = gpgme_op_genkey_result(context);
+    jobject resultObj;
+
+    if (result == NULL) {
+        return NULL;
+    }
+    //get the right constructor to invoke for every key in result set
+    jclass resultClass;
+    resultClass =
+        (*env)->FindClass(env, "com/freiheit/gnupg/GnuPGGenkeyResult");
+
+    if (resultClass == NULL) {
+        return NULL;
+    }
+
+    jmethodID cid;
+    cid = (*env)->GetMethodID(env, resultClass, "<init>", "()V");
+    if (cid == NULL) {
+        return NULL;
+    }
+
+    resultObj = (*env)->NewObject(env, resultClass, cid);
+
+    UTILS_setStringMember(env, resultObj, resultClass, "_fpr", result->fpr);
+    UTILS_setBooleanMember(env, resultObj, resultClass, "_primary",
+                           result->primary);
+    UTILS_setBooleanMember(env, resultObj, resultClass, "_sub", result->sub);
+
+    return resultObj;
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpDelete(JNIEnv* env,
+        jobject self,
+        jlong ctx,
+        jlong key,
+        jboolean allowSecret)
+{
+
+    gpgme_ctx_t context = CONTEXT(ctx);
+    gpgme_key_t deletekey = KEY(key);
+    unsigned int sec = (unsigned int) allowSecret;
+    gpgme_error_t err;
+
+
+    err = gpgme_op_delete(context, deletekey, sec);
+
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+}
+
+/*
+ * Local Variables:
+ * tab-width: 4;
+ * c-basic-offset: 4;
+ * c-file-style: k&r;
+ * indent-tabs-mode: nil;
+ * End:
+ */
diff --git a/jni/GnuPGData.c b/jni/GnuPGData.c
new file mode 100644
index 0000000..fe2e856
--- /dev/null
+++ b/jni/GnuPGData.c
@@ -0,0 +1,200 @@
+#include <jni.h>
+#include <stdio.h>
+#include <gpgme.h>
+
+#include "gpgmeutils.h"
+#include "com_freiheit_gnupg_GnuPGData.h"
+
+// TODO, this is a private header, figure out public techniques...
+#include "data.h"
+
+#define BUFSIZE 1024
+
+
+JNIEXPORT jsize JNICALL
+Java_com_freiheit_gnupg_GnuPGData_gpgmeSize(JNIEnv* env, jobject self, jlong data)
+{
+    return (jsize)(DATA(data))->data.mem.size;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_freiheit_gnupg_GnuPGData_gpgmeDataNewFromMem(JNIEnv* env,
+        jobject self,
+        jbyteArray plain)
+{
+    gpgme_error_t err;
+
+    jbyte* plain_ptr = (*env)->GetByteArrayElements(env, plain, NULL);  //GETMEM(0)
+    if (plain_ptr == NULL) {
+        fprintf(stderr, "could not allocate memory.\n");
+        return 0;
+    }
+
+    gpgme_data_t data;
+    jlong len = (*env)->GetArrayLength(env, plain);
+
+    //make private copy of data
+    err = gpgme_data_new_from_mem(&data, (const char*) plain_ptr,
+                                  (size_t) len, 1);
+    if (UTILS_onErrorThrowException(env, err)) {
+        return LNG(NULL);
+    }
+
+    (*env)->ReleaseByteArrayElements(env, plain, plain_ptr, 0);  //RELMEM(0)
+    jlong result = LNG(data);
+    return result;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_freiheit_gnupg_GnuPGData_gpgmeDataNewFromFilename(JNIEnv* env,
+        jobject self,
+        jstring filename,
+        jstring mode)
+{
+    const char* mode_str = (*env)->GetStringUTFChars(env, mode, NULL);
+    const char* filename_str = (*env)->GetStringUTFChars(env, filename, NULL);
+    if (filename_str == NULL) {
+        fprintf(stderr, "could not allocate memory.\n");
+        return 0;
+    }
+
+    gpgme_data_t data;
+    FILE* stream = fopen(filename_str, mode_str);
+    gpgme_error_t err = gpgme_data_new_from_stream(&data, stream);
+    if (UTILS_onErrorThrowException(env, err)) {
+        return LNG(NULL);
+    }
+
+    (*env)->ReleaseStringUTFChars(env, filename, filename_str);
+    (*env)->ReleaseStringUTFChars(env, mode, mode_str);
+
+    jlong result = LNG(data);
+    return result;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_freiheit_gnupg_GnuPGData_gpgmeDataNew(JNIEnv* env, jobject self)
+{
+    gpgme_data_t data;
+    gpgme_error_t err = gpgme_data_new(&data);
+    if (UTILS_onErrorThrowException(env, err)) {
+        return LNG(NULL);
+    }
+
+    return LNG(data);
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGData_gpgmeDataWrite(JNIEnv* env, jobject self,
+        jlong data, jobject out)
+{
+    gpgme_error_t err;
+
+    jbyte buf[BUFSIZE];
+    size_t nread;
+
+    jclass outputStream = (*env)->GetObjectClass(env, out);
+    if (outputStream == NULL) {
+        fprintf(stderr, "output stream NULL! abort.\n");
+        return;
+    }
+
+    jmethodID writeMethod =
+        (*env)->GetMethodID(env, outputStream, "write", "([BII)V");
+    if (writeMethod == NULL) {
+        fprintf(stderr, "write method NULL! abort.\n");
+        return;
+    }
+
+    jbyteArray jbuf;
+
+    err = (gpgme_data_seek(DATA(data), (off_t)0, SEEK_SET) < 0);
+    if (UTILS_onErrorThrowException(env, err)) {
+        fprintf(stderr, "error throw exception! abort.\n");
+        return;
+    }
+
+    int size = 0;
+    while ((nread = gpgme_data_read(DATA(data), buf, BUFSIZE)) != 0) {
+        size += nread;
+        jbuf = (*env)->NewByteArray(env, nread);
+        if (jbuf == NULL) {
+            fprintf(stderr, "jbuf is NULL! abort.\n");
+            return;
+        }
+        (*env)->SetByteArrayRegion(env, jbuf, 0, nread, buf);
+        (*env)->CallVoidMethod(env, out, writeMethod, jbuf, (jint)0,
+                               (jint)nread);
+        if ((*env)->ExceptionCheck(env)) {
+            (*env)->DeleteLocalRef(env, jbuf);
+            return;
+        }
+        (*env)->DeleteLocalRef(env, jbuf);
+    }
+
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGData_gpgmeDataRelease(JNIEnv* env, jobject self,
+        jlong data)
+{
+    gpgme_data_t dh = DATA(data);
+    if (dh->data.stream != NULL)
+        fclose(dh->data.stream);
+    gpgme_data_release(dh);
+}
+
+JNIEXPORT void JNICALL
+Java_com_freiheit_gnupg_GnuPGData_gpgmeDataRead(JNIEnv* env, jobject self,
+        jlong data, jobject in)
+{
+    gpgme_error_t err;
+
+    jclass inputStream = (*env)->GetObjectClass(env, in);
+    if (inputStream == NULL) {
+        fprintf(stderr, "input stream NULL! abort.\n");
+        return;
+    }
+
+    jmethodID readMethod = (*env)->GetMethodID(env, inputStream,
+                           "read", "([BII)I");
+    if (readMethod == NULL) {
+        fprintf(stderr, "read method NULL! abort.\n");
+        return;
+    }
+
+    jbyteArray jbuf = (*env)->NewByteArray(env, BUFSIZE);   //GETMEM(0)
+    jlong nread;
+
+    err = (gpgme_data_seek(DATA(data), (off_t)0, SEEK_SET) < 0);
+    if (UTILS_onErrorThrowException(env, err)) {
+        return;
+    }
+
+    while ((nread = (*env)->CallIntMethod(env, in, readMethod,
+                                          jbuf, (jint)0, BUFSIZE)) != -1) {
+
+        jbyte* buf = (*env)->GetByteArrayElements(env, jbuf, NULL);
+        if (buf == NULL) {
+            return;
+        }
+
+        gpgme_data_write(DATA(data), buf, nread);
+        if ((*env)->ExceptionCheck(env)) {
+            (*env)->DeleteLocalRef(env, jbuf);
+            return;
+        }
+
+    }
+    (*env)->DeleteLocalRef(env, jbuf);  //RELMEM(0)
+
+}
+
+/*
+ * Local Variables:
+ * tab-width: 4;
+ * c-basic-offset: 4;
+ * c-file-style: k&r;
+ * indent-tabs-mode: nil;
+ * End:
+ */
diff --git a/src/c/GnuPGGenkeyResult.c b/jni/GnuPGGenkeyResult.c
similarity index 54%
rename from src/c/GnuPGGenkeyResult.c
rename to jni/GnuPGGenkeyResult.c
index 4e71a96..a154669 100644
--- a/src/c/GnuPGGenkeyResult.c
+++ b/jni/GnuPGGenkeyResult.c
@@ -1,31 +1,41 @@
 #include <jni.h>
 #include <stdio.h>
-#include "com_freiheit_gnupg_GnuPGGenkeyResult.h"
+#include <gpgme.h>
+
 #include "gpgmeutils.h"
+#include "com_freiheit_gnupg_GnuPGGenkeyResult.h"
 
-#include <gpgme.h>
 
 JNIEXPORT jstring JNICALL
-Java_com_freiheit_gnupg_GnuPGGenkeyResult_gpgmeGetFpr(JNIEnv * env,
-						      jobject self,
-						      jlong result)
+Java_com_freiheit_gnupg_GnuPGGenkeyResult_gpgmeGetFpr(JNIEnv* env,
+        jobject self,
+        jlong result)
 {
     jstring str = (*env)->NewStringUTF(env, (GENKEYRESULT(result))->fpr);
     return str;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_freiheit_gnupg_GnuPGGenkeyResult_gpgmeGetPrimary(JNIEnv * env,
-							  jobject self,
-							  jlong result)
+Java_com_freiheit_gnupg_GnuPGGenkeyResult_gpgmeGetPrimary(JNIEnv* env,
+        jobject self,
+        jlong result)
 {
     return (GENKEYRESULT(result))->primary;
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_freiheit_gnupg_GnuPGGenkeyResult_gpgmeGetSub(JNIEnv * env,
-						      jobject self,
-						      jlong result)
+Java_com_freiheit_gnupg_GnuPGGenkeyResult_gpgmeGetSub(JNIEnv* env,
+        jobject self,
+        jlong result)
 {
     return (GENKEYRESULT(result))->primary;
 }
+
+/*
+ * Local Variables:
+ * tab-width: 4;
+ * c-basic-offset: 4;
+ * c-file-style: k&r;
+ * indent-tabs-mode: nil;
+ * End:
+ */
diff --git a/jni/GnuPGKey.c b/jni/GnuPGKey.c
new file mode 100644
index 0000000..ee19ec2
--- /dev/null
+++ b/jni/GnuPGKey.c
@@ -0,0 +1,224 @@
+#include <jni.h>
+#include <stdio.h>
+#include <gpgme.h>
+
+#include "gpgmeutils.h"
+#include "com_freiheit_gnupg_GnuPGKey.h"
+
+
+JNIEXPORT jlong JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetKey(JNIEnv* env, jobject self,
+        jlong context, jstring fingerprint,
+        jboolean secret)
+{
+    gpgme_key_t key;
+
+    const char* fpr = (*env)->GetStringUTFChars(env, fingerprint, NULL);
+    gpgme_error_t err = gpgme_get_key(CONTEXT(context), fpr, &key, secret);
+    if (UTILS_onErrorThrowException(env, err)) {
+        (*env)->ReleaseStringUTFChars(env, fingerprint, fpr);
+        return LNG(NULL);
+    }
+    (*env)->ReleaseStringUTFChars(env, fingerprint, fpr);
+
+    //setMembers(env, self, key);
+
+    return LNG(key);
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeKeyUnref(JNIEnv* env, jobject self,
+        jlong key)
+{
+    gpgme_key_unref(KEY(key));
+    return 0l;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetName(JNIEnv* env, jobject self,
+        jlong key)
+{
+    jstring str = (*env)->NewStringUTF(env, (KEY(key))->uids->name);
+    return str;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetEmail(JNIEnv* env, jobject self,
+        jlong key)
+{
+    jstring str = (*env)->NewStringUTF(env, (KEY(key))->uids->email);
+    return str;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetKeyID(JNIEnv* env, jobject self,
+        jlong key)
+{
+    jstring str = (*env)->NewStringUTF(env, (KEY(key))->subkeys->keyid);
+    return str;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetTimestamp(JNIEnv* env, jobject self,
+        jlong key)
+{
+    return (KEY(key))->subkeys->timestamp;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetFingerprint(JNIEnv* env, jobject self,
+        jlong key)
+{
+    jstring str = (*env)->NewStringUTF(env, (KEY(key))->subkeys->fpr);
+    return str;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetComment(JNIEnv* env, jobject self,
+        jlong key)
+{
+    jstring str = (*env)->NewStringUTF(env, (KEY(key))->uids->comment);
+    return str;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetUserID(JNIEnv* env, jobject self,
+        jlong key)
+{
+    jstring str = (*env)->NewStringUTF(env, (KEY(key))->uids->uid);
+    return str;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetSignature(JNIEnv* env, jobject self,
+        jlong key)
+{
+    return LNG((KEY(key))->uids->signatures);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeCanEncrypt(JNIEnv* env, jobject self,
+        jlong key)
+{
+    return (KEY(key))->can_encrypt;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeCanSign(JNIEnv* env, jobject self,
+        jlong key)
+{
+    return (KEY(key))->can_sign;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeCanCerify(JNIEnv* env, jobject self,
+        jlong key)
+{
+    return (KEY(key))->can_certify;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeCanAuthenticate(JNIEnv* env, jobject self,
+        jlong key)
+{
+    return (KEY(key))->can_authenticate;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeIsRevoked(JNIEnv* env, jobject self,
+        jlong key)
+{
+    return (KEY(key))->revoked;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeIsExpired(JNIEnv* env, jobject self,
+        jlong key)
+{
+    return (KEY(key))->expired;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeIsDisabled(JNIEnv* env, jobject self,
+        jlong key)
+{
+    return (KEY(key))->disabled;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeIsInvalid(JNIEnv* env, jobject self,
+        jlong key)
+{
+    return (KEY(key))->invalid;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeIsQualified(JNIEnv* env, jobject self,
+        jlong key)
+{
+    return (KEY(key))->is_qualified;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeIsSecret(JNIEnv* env, jobject self,
+        jlong key)
+{
+    return (KEY(key))->secret;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGKey_gpgmeHasSecretKey(JNIEnv* env, jobject self,
+        jlong key)
+{
+    gpgme_subkey_t subkey;
+    for (subkey = KEY(key)->subkeys; subkey; subkey = subkey->next)
+        if (subkey->secret)
+            return 1;
+    return 0;
+}
+
+/* void */
+/* setMembers(JNIEnv *env, jobject self, gpgme_key_t key){ */
+/*   jclass cls = (*env)->GetObjectClass(env, self); */
+
+/*   jfieldID uid_fld = (*env)->GetFieldID(env, cls, "_uid", "Ljava/lang/String;"); */
+/*   if(uid_fld == NULL) return; */
+/*   jfieldID name_fld = (*env)->GetFieldID(env, cls, "_name", "Ljava/lang/String;"); */
+/*   if(name_fld == NULL) return; */
+/*   jfieldID email_fld = (*env)->GetFieldID(env, cls, "_email", "Ljava/lang/String;"); */
+/*   if(email_fld == NULL) return; */
+/*   jfieldID keyid_fld = (*env)->GetFieldID(env, cls, "_keyid", "Ljava/lang/String;"); */
+/*   if(keyid_fld == NULL) return; */
+/*   jfieldID fpr_fld = (*env)->GetFieldID(env, cls, "_fpr", "Ljava/lang/String;"); */
+/*   if(fpr_fld == NULL) return; */
+
+/*   jstring uid_jstr = (*env)->NewStringUTF(env, key->uids->uid); */
+/*   if(uid_jstr == NULL) return; */
+/*   (*env)->SetObjectField(env, self, uid_fld, uid_jstr); */
+
+/*   jstring name_jstr = (*env)->NewStringUTF(env, key->uids->name); */
+/*   if(name_jstr == NULL) return; */
+/*   (*env)->SetObjectField(env, self, name_fld, name_jstr); */
+
+/*   jstring email_jstr = (*env)->NewStringUTF(env, key->uids->email); */
+/*   if(email_jstr == NULL) return; */
+/*   (*env)->SetObjectField(env, self, email_fld, email_jstr); */
+
+/*   jstring keyid_jstr = (*env)->NewStringUTF(env, key->subkeys->keyid); */
+/*   if(keyid_jstr == NULL) return; */
+/*   (*env)->SetObjectField(env, self, keyid_fld, keyid_jstr); */
+
+/*   jstring fpr_jstr = (*env)->NewStringUTF(env, key->subkeys->fpr); */
+/*   if(fpr_jstr == NULL) return; */
+/*   (*env)->SetObjectField(env, self, fpr_fld, fpr_jstr); */
+
+/* } */
+
+/*
+ * Local Variables:
+ * tab-width: 4;
+ * c-basic-offset: 4;
+ * c-file-style: k&r;
+ * indent-tabs-mode: nil;
+ * End:
+ */
diff --git a/jni/GnuPGSignature.c b/jni/GnuPGSignature.c
new file mode 100644
index 0000000..64d0186
--- /dev/null
+++ b/jni/GnuPGSignature.c
@@ -0,0 +1,93 @@
+#include <jni.h>
+#include <stdio.h>
+#include <gpgme.h>
+
+#include "gpgmeutils.h"
+#include "com_freiheit_gnupg_GnuPGSignature.h"
+
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetRevoked(JNIEnv* env,
+        jobject self, jlong sig)
+{
+    return (jboolean)(KEYSIG(sig))->revoked;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetExpired(JNIEnv* env,
+        jobject self, jlong sig)
+{
+    return (jboolean)(KEYSIG(sig))->expired;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetInvalid(JNIEnv* env,
+        jobject self, jlong sig)
+{
+    return (jboolean)(KEYSIG(sig))->invalid;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetExportable(JNIEnv* env,
+        jobject self,
+        jlong sig)
+{
+    return (jboolean)(KEYSIG(sig))->exportable;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetKeyID(JNIEnv* env, jobject self,
+        jlong sig)
+{
+    jstring str = (*env)->NewStringUTF(env, (KEYSIG(sig))->keyid);
+    return str;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetUserID(JNIEnv* env,
+        jobject self, jlong sig)
+{
+    jstring str = (*env)->NewStringUTF(env, (KEYSIG(sig))->uid);
+    return str;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetName(JNIEnv* env, jobject self,
+        jlong sig)
+{
+    jstring str = (*env)->NewStringUTF(env, (KEYSIG(sig))->name);
+    return str;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetEmail(JNIEnv* env, jobject self,
+        jlong sig)
+{
+    jstring str = (*env)->NewStringUTF(env, (KEYSIG(sig))->email);
+    return str;
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetComment(JNIEnv* env,
+        jobject self, jlong sig)
+{
+    jstring str = (*env)->NewStringUTF(env, (KEYSIG(sig))->comment);
+    return str;
+}
+
+JNIEXPORT jlong JNICALL
+Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetNextSignature(JNIEnv* env,
+        jobject self,
+        jlong sig)
+{
+    return LNG((KEYSIG(sig))->next);
+}
+
+/*
+ * Local Variables:
+ * tab-width: 4;
+ * c-basic-offset: 4;
+ * c-file-style: k&r;
+ * indent-tabs-mode: nil;
+ * End:
+ */
diff --git a/jni/data.h b/jni/data.h
new file mode 100644
index 0000000..415c7a3
--- /dev/null
+++ b/jni/data.h
@@ -0,0 +1,140 @@
+/* data.h - Internal data object abstraction interface.
+   Copyright (C) 2002, 2004, 2005 g10 Code GmbH
+
+   This file is part of GPGME.
+
+   GPGME is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of
+   the License, or (at your option) any later version.
+
+   GPGME is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */
+
+#ifndef DATA_H
+#define DATA_H
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <limits.h>
+
+#include "gpgme.h"
+
+
+/* Read up to SIZE bytes into buffer BUFFER from the data object with
+   the handle DH.  Return the number of characters read, 0 on EOF and
+   -1 on error.  If an error occurs, errno is set.  */
+typedef gpgme_ssize_t (*gpgme_data_read_cb)(gpgme_data_t dh,
+        void* buffer,
+        size_t size);
+
+/* Write up to SIZE bytes from buffer BUFFER to the data object with
+   the handle DH.  Return the number of characters written, or -1 on
+   error.  If an error occurs, errno is set.  */
+typedef gpgme_ssize_t (*gpgme_data_write_cb)(gpgme_data_t dh,
+        const void* buffer,
+        size_t size);
+
+/* Set the current position from where the next read or write starts
+   in the data object with the handle DH to OFFSET, relativ to
+   WHENCE.  */
+typedef gpgme_off_t (*gpgme_data_seek_cb)(gpgme_data_t dh,
+        gpgme_off_t offset,
+        int whence);
+
+/* Release the data object with the handle DH.  */
+typedef void (*gpgme_data_release_cb)(gpgme_data_t dh);
+
+/* Get the FD associated with the handle DH, or -1.  */
+typedef int (*gpgme_data_get_fd_cb)(gpgme_data_t dh);
+
+struct _gpgme_data_cbs {
+    gpgme_data_read_cb read;
+    gpgme_data_write_cb write;
+    gpgme_data_seek_cb seek;
+    gpgme_data_release_cb release;
+    gpgme_data_get_fd_cb get_fd;
+};
+
+struct gpgme_data {
+    struct _gpgme_data_cbs* cbs;
+    gpgme_data_encoding_t encoding;
+
+#ifdef PIPE_BUF
+#define BUFFER_SIZE PIPE_BUF
+#else
+#ifdef _POSIX_PIPE_BUF
+#define BUFFER_SIZE _POSIX_PIPE_BUF
+#else
+#define BUFFER_SIZE 512
+#endif
+#endif
+    char pending[BUFFER_SIZE];
+    int pending_len;
+
+    /* File name of the data object.  */
+    char* file_name;
+
+    union {
+        /* For gpgme_data_new_from_fd.  */
+        int fd;
+
+        /* For gpgme_data_new_from_stream.  */
+        FILE* stream;
+
+        /* For gpgme_data_new_from_cbs.  */
+        struct {
+            gpgme_data_cbs_t cbs;
+            void* handle;
+        } user;
+
+        /* For gpgme_data_new_from_mem.  */
+        struct {
+            char* buffer;
+            const char* orig_buffer;
+            /* Allocated size of BUFFER.  */
+            size_t size;
+            size_t length;
+            gpgme_off_t offset;
+        } mem;
+
+        /* For gpgme_data_new_from_read_cb.  */
+        struct {
+            int (*cb)(void*, char*, size_t, size_t*);
+            void* handle;
+        } old_user;
+    } data;
+};
+
+
+gpgme_error_t _gpgme_data_new(gpgme_data_t* r_dh,
+                              struct _gpgme_data_cbs* cbs);
+
+void _gpgme_data_release(gpgme_data_t dh);
+
+/* Get the file descriptor associated with DH, if possible.  Otherwise
+   return -1.  */
+int _gpgme_data_get_fd(gpgme_data_t dh);
+
+#endif  /* DATA_H */
+
+/*
+ * Local Variables:
+ * tab-width: 4;
+ * c-basic-offset: 4;
+ * c-file-style: k&r;
+ * indent-tabs-mode: nil;
+ * End:
+ */
diff --git a/jni/format-code.sh b/jni/format-code.sh
new file mode 100755
index 0000000..97b787d
--- /dev/null
+++ b/jni/format-code.sh
@@ -0,0 +1,13 @@
+#/bin/bash
+
+ASTYLE=`which astyle 2> /dev/null`
+if [[ $? -ne 0 ]]; then
+    echo "astyle code formatter not installed. aborting."
+    exit 1
+fi
+
+ASTYLE_ARGS="--style=kr --indent=spaces=4 --convert-tabs --pad-oper --unpad-paren --pad-header --align-pointer=type --align-reference=type"
+
+$ASTYLE $ASTYLE_ARGS *.h
+$ASTYLE $ASTYLE_ARGS *.c
+
diff --git a/jni/gpgmeutils.c b/jni/gpgmeutils.c
new file mode 100644
index 0000000..4ee9b5b
--- /dev/null
+++ b/jni/gpgmeutils.c
@@ -0,0 +1,121 @@
+#include "gpgmeutils.h"
+#include <stdio.h>
+
+#define BUF_LEN 1024
+
+jboolean
+UTILS_setStringMember(JNIEnv* env, jobject self, jclass selfclass,
+                      const char* fieldname, const char* fieldvalue)
+{
+    //get the field from the class
+    jfieldID fld =
+        (*env)->GetFieldID(env, selfclass, fieldname, "Ljava/lang/String;");
+    if (fld == NULL) {
+        return JNI_FALSE;
+    }
+
+    jstring jval = (*env)->NewStringUTF(env, fieldvalue);
+    if (jval == NULL) {
+        return JNI_FALSE;
+    }
+    (*env)->SetObjectField(env, self, fld, jval);
+    return JNI_TRUE;
+}
+
+jboolean
+UTILS_setIntMember(JNIEnv* env, jobject self, jclass selfclass,
+                   const char* fieldname, int fieldvalue)
+{
+    //get the field from the class
+
+    jlong jval = (jlong) fieldvalue;
+
+    jfieldID fld = (*env)->GetFieldID(env, selfclass, fieldname, "I");
+    if (fld == NULL) {
+        return JNI_FALSE;
+    }
+
+    if (jval == 0) {
+        return JNI_FALSE;
+    }
+    (*env)->SetIntField(env, self, fld, jval);
+    return JNI_TRUE;
+}
+
+void
+UTILS_setBooleanMember(JNIEnv* env, jobject self, jclass selfclass,
+                       const char* fieldname, unsigned int fieldvalue)
+{
+    //get the field from the class
+
+    jboolean jval = (jboolean) fieldvalue;
+
+    jfieldID fld = (*env)->GetFieldID(env, selfclass, fieldname, "Z");
+    if (fld == NULL) {
+        return;
+    }
+
+    if (jval == 0) {
+        return;
+    }
+    (*env)->SetBooleanField(env, self, fld, jval);
+}
+
+jboolean UTILS_onErrorThrowException(JNIEnv* env, gpgme_error_t err)
+{
+    if (err) {
+        char exceptionString[BUF_LEN];  /* this is enough */
+        int spaceUsed;
+        jclass exception =
+            (*env)->FindClass(env, "com/freiheit/gnupg/GnuPGException");
+
+        if (exception == NULL) {
+            return JNI_TRUE;
+        }
+        spaceUsed = snprintf(exceptionString, BUF_LEN, "%u: ", err);
+        gpgme_strerror_r(err, exceptionString + spaceUsed, BUF_LEN - spaceUsed);
+        (*env)->ThrowNew(env, exception, exceptionString);
+        (*env)->DeleteLocalRef(env, exception);
+        return JNI_TRUE;
+    } else {
+        return JNI_FALSE;
+    }
+}
+
+int
+UTILS_copyRecipientsFromJvm(JNIEnv* env, jlongArray recipients,
+                            gpgme_key_t keys[])
+{
+    //how many keys from recipients did we receive?
+    jsize len = (*env)->GetArrayLength(env, recipients);
+    if (len < 1) {
+        return len;
+    }
+
+    //allocate native memory from recipient keys
+    jlong* carr = (*env)->GetLongArrayElements(env, recipients, NULL);
+    if (carr == NULL) {
+        return -1;
+    }
+    //copy recipient keys to new array...
+    int i;
+    for (i = 0; i < len; i++) {
+        keys[i] = KEY(carr[i]);
+    }
+    //and mark the end of the array with a NULL.
+    keys[len] = NULL;
+
+    //release the memory allocated from the recipients key list
+    (*env)->ReleaseLongArrayElements(env, recipients, carr, 0);
+
+    return len;
+}
+
+/*
+ * Local Variables:
+ * tab-width: 4;
+ * c-basic-offset: 4;
+ * c-file-style: k&r;
+ * indent-tabs-mode: nil;
+ * End:
+ */
diff --git a/src/c/gpgmeutils.h b/jni/gpgmeutils.h
similarity index 57%
rename from src/c/gpgmeutils.h
rename to jni/gpgmeutils.h
index 4f66b34..89f9afe 100644
--- a/src/c/gpgmeutils.h
+++ b/jni/gpgmeutils.h
@@ -2,21 +2,20 @@
 #define GPGME_JAVA_UTILS
 
 #include <jni.h>
-#include <gpg-error.h>
 #include <gpgme.h>
 
-jboolean UTILS_setStringMember(JNIEnv * env, jobject self, jclass selfclass,
-			       const char *fieldname, const char *fieldvalue);
+jboolean UTILS_setStringMember(JNIEnv* env, jobject self, jclass selfclass,
+                               const char* fieldname, const char* fieldvalue);
 
-jboolean UTILS_setIntMember(JNIEnv * env, jobject self, jclass selfclass,
-			    const char *fieldname, int fieldvalue);
+jboolean UTILS_setIntMember(JNIEnv* env, jobject self, jclass selfclass,
+                            const char* fieldname, int fieldvalue);
 
-void UTILS_setBooleanMember(JNIEnv * env, jobject self, jclass selfclass,
-			    const char *fieldname, unsigned int fieldvalue);
+void UTILS_setBooleanMember(JNIEnv* env, jobject self, jclass selfclass,
+                            const char* fieldname, unsigned int fieldvalue);
 
-jboolean UTILS_onErrorThrowException(JNIEnv * env, gpgme_error_t err);
+jboolean UTILS_onErrorThrowException(JNIEnv* env, gpgme_error_t err);
 
-int UTILS_copyRecipientsFromJvm(JNIEnv * env, jlongArray recipients, gpgme_key_t keys[]);
+int UTILS_copyRecipientsFromJvm(JNIEnv* env, jlongArray recipients, gpgme_key_t keys[]);
 
 /* use this macro to convert a jlong variable to a pointer to a gpgme context in a safe and portable way */
 #define CONTEXT(c) ((gpgme_ctx_t)_ptrFromJLong(c))
@@ -33,14 +32,23 @@ int UTILS_copyRecipientsFromJvm(JNIEnv * env, jlongArray recipients, gpgme_key_t
 #define LNG(a) (_jlongFromPtr(a))
 
 // don't use this directly, it is wrapped by the PTR() macro
-inline static void *_ptrFromJLong(jlong l)
+inline static void* _ptrFromJLong(jlong l)
 {
-    return (void *) (unsigned long) l;
+    return (void*)(unsigned long) l;
 }
 
 // don't use this directly, it is wrapped by the PTR() macro
-inline static jlong _jlongFromPtr(void *p)
+inline static jlong _jlongFromPtr(void* p)
 {
-    return (jlong) (unsigned long) p;
+    return (jlong)(unsigned long) p;
 }
 #endif
+
+/*
+ * Local Variables:
+ * tab-width: 4;
+ * c-basic-offset: 4;
+ * c-file-style: k&r;
+ * indent-tabs-mode: nil;
+ * End:
+ */
diff --git a/lib/junit-3.8.1.jar b/lib/junit-3.8.1.jar
deleted file mode 100644
index 674d71e..0000000
Binary files a/lib/junit-3.8.1.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..06a7bf9
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,63 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.gnupg</groupId>
+  <artifactId>gnupg-for-java</artifactId>
+  <version>0.2-pre-SNAPSHOT</version>
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.7</version>
+        <executions>
+          <execution>
+            <phase>process-classes</phase>
+            <configuration>
+              <target>
+                <exec executable="make" dir="jni" failonerror="true">
+                  <arg value="BUILD_DIR=${project.build.directory}"/>
+                  <arg value="CLASSES_DIR=${project.build.outputDirectory}"/>
+                  <arg value="headers"/>
+                </exec>
+                <exec executable="make" dir="jni" failonerror="true">
+                  <arg value="BUILD_DIR=${project.build.directory}"/>
+                  <arg value="lib"/>
+                </exec>
+                <attachartifact file="${project.build.directory}/libgnupg-for-java.so" type="so" />
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>com.sun</groupId>
+            <artifactId>tools</artifactId>
+            <version>1.7.0</version>
+            <scope>system</scope>
+            <systemPath>${java.home}/../lib/tools.jar</systemPath>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.7</version>
+        <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/runTests.sh b/runTests.sh
deleted file mode 100755
index 7942bab..0000000
--- a/runTests.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#STYLE=textui
-STYLE=swingui
-#STYLE=awtui
-java -cp dist/javagnupg-0.1.2-alpha.jar:lib/junit-3.8.1.jar junit.${STYLE}.TestRunner com.freiheit.gnupg.GnuPGTestSuite
diff --git a/src/c/GNUmakefile b/src/c/GNUmakefile
deleted file mode 100644
index a43e525..0000000
--- a/src/c/GNUmakefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# to use the JAVA_HOME var in the environment, use the `-e' flag to make
-ifeq ($(JAVA_HOME),,)
-JAVA_HOME := /www/home/tcadm/local/jdk-amd64
-#JAVA_HOME := /opt/java/jdk1.5.0_06
-#JAVA_HOME := /usr/lib/jvm/java-1.5.0-sun
-#JAVA_HOME := /usr/local/jdk1.4.2
-endif
-
-# set this from the command line to enforce a particular OS-bitness
-BITS := $(shell /bin/uname -m | grep ".*_[0-9]\+" | sed "s/.*_\([0-9]\+\)/\1/")
-
-JAVAGNUPG_LIB := libjavagnupg
-JNISRC := $(wildcard GnuPG*.c)
-JNI_CLASSES := $(patsubst %.c, com.freiheit.gnupg.%, $(JNISRC))
-JNI_HEADERS := $(patsubst %.c, com_freiheit_gnupg_%.h, $(JNISRC))
-SOURCES := $(JNISRC) gpgmeutils.c
-OBJECTS := $(SOURCES:.c=.o)
-
-JAVAP := $(JAVA_HOME)/bin/javap
-JAVAH := $(JAVA_HOME)/bin/javah
-JAVA  := $(JAVA_HOME)/bin/java
-
-CC := gcc
-INSTALL := install -m 644
-
-MARCH := 
-ifneq ($(BITS),)
-MARCH := -m$(BITS)
-else
-BITS := 32
-endif
-DEBUG := -g
-CFLAGS := $(MARCH) -Werror -Wall -Wno-deprecated-declarations -fPIC $(shell gpgme-config --cflags)
-CPPFLAGS := -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-
-C_IMPL := ./src/c
-JAVA_BUILD := ../../build
-LDFLAGS := $(shell gpgme-config --thread=pthread --libs)
-
-lib: $(JAVAGNUPG_LIB).$(BITS).so
-
-$(JAVAGNUPG_LIB).$(BITS).so: $(OBJECTS)
-	$(CC) $(DEBUG) -shared $(CFLAGS) $^ -o $@ $(LDFLAGS)
-	$(INSTALL) -m 755 -d $(JAVA_BUILD)/c
-	$(INSTALL) $(JAVAGNUPG_LIB).$(BITS).so $(JAVA_BUILD)/c
-
-header: $(JNI_HEADERS)
-
-$(JNI_HEADERS):
-	$(JAVAH) -classpath $(JAVA_BUILD) -jni $(JNI_CLASSES)
-
-mids:
-	$(JAVAP) -classpath $(JAVA_BUILD) -s -p $(JNI_CLASSES)
-
-clean:
-	@echo "NOT deleting the shared libraries. Use \`distclean' target to remove them."
-	rm -f $(OBJECTS) *~
-
-distclean:
-	$(MAKE) clean
-	rm -f $(JAVAGNUPG_LIB).*.so
-
-%.o: %.c $(JNI_HEADERS) gpgmeutils.h
-	$(CC) $(DEBUG) $(CFLAGS) $(CPPFLAGS) -c $<
diff --git a/src/c/GnuPGContext.c b/src/c/GnuPGContext.c
deleted file mode 100644
index ea49c29..0000000
--- a/src/c/GnuPGContext.c
+++ /dev/null
@@ -1,887 +0,0 @@
-#include <jni.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <locale.h>
-#include <gpg-error.h>
-#include <gpgme.h>
-
-#include "com_freiheit_gnupg_GnuPGContext.h"
-#include "gpgmeutils.h"
-
-JavaVM *_jvm;
-
-gpgme_error_t
-passphrase_cb(void *hook, const char *uid_hint, const char *passphrase_info,
-	      int prev_was_bad, int fd)
-{
-    jobject self = (jobject) hook;
-
-    if (self == NULL) {
-	return GPG_ERR_GENERAL;
-    }
-
-    JNIEnv *env;
-    (*_jvm)->AttachCurrentThread(_jvm, (void **) &env, NULL);
-
-    jclass cls = (*env)->GetObjectClass(env, self);
-
-    if (cls == NULL) {
-	return GPG_ERR_GENERAL;
-    }
-
-    char methodDescr[] =
-	"(Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;";
-    jmethodID mid =
-	(*env)->GetMethodID(env, cls, "passphraseCallback", methodDescr);
-
-    if (mid == NULL) {
-	return GPG_ERR_GENERAL;
-    }
-
-    //jbyte *hint = (*env)->NewStringUTF(env, uid_hint);
-    jstring hint = (*env)->NewStringUTF(env, uid_hint);
-    if (hint == NULL) {
-	return GPG_ERR_GENERAL;
-    }
-
-    jstring pphrinfo = (*env)->NewStringUTF(env, passphrase_info);
-    if (pphrinfo == NULL) {
-	return GPG_ERR_GENERAL;
-    }
-
-    //jbyte *pphr;//passphrase is return value from callback to Java
-    jstring pphr;		//passphrase is return value from callback to Java
-    pphr = (*env)->CallObjectMethod(env, self, mid, hint, pphrinfo, (jlong)0);
-
-    if (pphr == NULL) {
-	return GPG_ERR_CANCELED;
-    }
-
-    int len = (*env)->GetStringLength(env, pphr);
-    char buf[len + 1];		//leave the last char for newline
-
-    //TODO: Check for errors after the next call?!
-    (*env)->GetStringUTFRegion(env, pphr, 0, len, buf);
-
-    buf[len] = '\n';		//add the newline to the end...
-
-    ssize_t written;
-    written = write(fd, buf, len);
-    if (written == -1) {
-	return GPG_ERR_GENERAL;
-    }
-
-    return GPG_ERR_NO_ERROR;
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeCheckVersion(JNIEnv * env, jclass cls)
-{
-    setlocale(LC_ALL, "");
-    //FIXME: The tests are hanging, when I use check_version, which is actually
-    // initializing the threading subsystem...hmmm..
-    //char* version = gpgme_check_version (NULL);
-    //printf("VERSION: %s\n", version);
-    gpgme_set_locale(NULL, LC_CTYPE, setlocale(LC_CTYPE, NULL));
-    gpgme_set_locale(NULL, LC_MESSAGES, setlocale(LC_MESSAGES, NULL));
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeGetEngineInfo(JNIEnv * env,
-							jobject self)
-{
-    gpgme_engine_info_t engineInfo;
-    gpgme_get_engine_info(&engineInfo);
-
-    jclass cls = (*env)->GetObjectClass(env, self);
-
-    UTILS_setStringMember(env, self, cls, "_version", engineInfo->version);
-    UTILS_setStringMember(env, self, cls, "_filename", engineInfo->file_name);
-    UTILS_setStringMember(env, self, cls, "_reqversion",
-			  engineInfo->req_version);
-    UTILS_setIntMember(env, self, cls, "_protocol", engineInfo->protocol);
-}
-
-JNIEXPORT jlong JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeNew(JNIEnv * env, jobject self)
-{
-    gpgme_ctx_t ctx;
-    gpgme_new(&ctx);
-    gpgme_set_armor(ctx, 1);
-    gpgme_set_textmode(ctx, 1);
-    gpgme_set_keylist_mode(ctx,
-			   GPGME_KEYLIST_MODE_LOCAL | GPGME_KEYLIST_MODE_SIGS);
-
-    //store a handle to this jvm in a global variable
-    (*env)->GetJavaVM(env, &_jvm);
-
-    return LNG(ctx);
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpEncrypt(JNIEnv * env, jobject self,
-						    jlong context,
-						    jlongArray recipients,
-						    jlong plain, jlong cipher)
-{
-    gpgme_error_t err;
-
-    //how many keys from recipients did we receive?
-    jsize len = (*env)->GetArrayLength(env, recipients);
-
-    //allocate a new array with one field larger then number of recipient keys
-    gpgme_key_t keys[len + 1];	//allowed in C99 Standard...and useful!!!
-
-    // disabled on werners behalf (33% of the work)
-    // overriden bei sebastian.mangels@freiheit.com,
-    // we need ascii armor.
-    //gpgme_set_armor( CONTEXT(context), 0 );
-
-    if (UTILS_copyRecipientsFromJvm(env, recipients, keys) < 1) {
-	return;
-    }
-
-    err = gpgme_data_rewind(DATA(plain));	//TODO: Use seek instead of rewind
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    err = gpgme_data_rewind(DATA(cipher));	//TODO: Use seek instead of rewind
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-    //call gpgme library function for encryption
-    err = gpgme_op_encrypt(CONTEXT(context), keys, GPGME_ENCRYPT_ALWAYS_TRUST,
-			   DATA(plain), DATA(cipher));
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-/*   err = gpgme_op_encrypt_start(CONTEXT(context), keys, GPGME_ENCRYPT_ALWAYS_TRUST, (gpgme_data_t)plain, (gpgme_data_t)cipher); */
-/*   if(UTILS_onErrorThrowException(env, err)){ */
-/*     return; */
-/*   } */
-/*   gpgme_ctx_t waitedOn = gpgme_wait(CONTEXT(context), err, 1);//HANG UNTIL COMPLETED! */
-/*   if(waitedOn != NULL && UTILS_onErrorThrowException(env, err)){ */
-/*     return; */
-/*   } */
-
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpDecrypt(JNIEnv * env, jobject self,
-						    jlong context, jlong cipher,
-						    jlong plain)
-{
-    gpgme_error_t err;
-
-    gpgme_set_passphrase_cb(CONTEXT(context), passphrase_cb, (void *)self);
-
-    err = gpgme_data_rewind(DATA(cipher));	//TODO: Use seek instead of rewind
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    err = gpgme_data_rewind(DATA(plain));	//TODO: Use seek instead of rewind
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    err = gpgme_op_decrypt(CONTEXT(context), DATA(cipher), DATA(plain));
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-/*   err = gpgme_op_decrypt_start(CONTEXT(context), (gpgme_data_t)cipher, (gpgme_data_t)plain); */
-/*   if(UTILS_onErrorThrowException(env, err)){ */
-/*     return; */
-/*   } */
-/*   gpgme_ctx_t waitedOn = gpgme_wait(CONTEXT(context), err, 1);//HANG UNTIL COMPLETED! */
-/*   if(waitedOn != NULL && UTILS_onErrorThrowException(env, err)){ */
-/*     return; */
-/*   } */
-}
-
-static void flush_data(gpgme_data_t dh)
-{
-    char buf[100];
-    int ret;
-
-    ret = gpgme_data_seek(dh, 0, SEEK_SET);
-
-    while ((ret = gpgme_data_read(dh, buf, 100)) > 0)
-	fwrite(buf, ret, 1, stdout);
-
-}
-
-
-gpgme_error_t
-edit_fnc(void *opaque, gpgme_status_code_t status, const char *args, int fd)
-{
-    char *result = NULL;
-    gpgme_data_t out = (gpgme_data_t)opaque;
-
-    fputs("[-- Response --]\n", stdout);
-    flush_data(out);
-
-    fprintf(stdout, "[-- Code: %i, %s --]\n", status, args);
-
-    if (fd >= 0) {
-	if (!strcmp(args, "keyedit.prompt")) {
-	    static int switcher = 0;
-
-	    if (!switcher) {
-		result = "passwd";
-		switcher++;
-	    } else {
-		result = "save";
-		switcher--;
-	    }
-
-	} else if (!strcmp(args, "keyedit.save.okay")) {
-	    result = "Y";
-	} else if (!strcmp(args, "keygen.valid")) {
-	    result = "0";
-	} else if (!strcmp(args, "change_passwd.empty.okay")) {
-	    result = "N";
-	}
-    }
-
-    if (result) {
-	fprintf(stdout, "[-- Command: %s --]\n", result);
-	write(fd, result, strlen(result));
-	write(fd, "\n", 1);
-    }
-    return 0;
-}
-
-
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpChangePassphrase(JNIEnv * env,
-							     jobject self,
-							     jlong context,
-							     jlong keydata)
-{
-    gpgme_error_t err;
-
-    gpgme_data_t out = NULL;
-
-    gpgme_set_passphrase_cb(CONTEXT(context), passphrase_cb, self);
-
-    err = gpgme_data_new(&out);
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    err = gpgme_op_edit(CONTEXT(context), KEY(keydata), edit_fnc, out, out);
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    fputs("[-- Last response --]\n", stdout);
-    flush_data(out);
-
-    gpgme_data_release(out);
-
-/*   err = gpgme_op_decrypt_start(CONTEXT(context), (gpgme_data_t)cipher, (gpgme_data_t)plain); */
-/*   if(UTILS_onErrorThrowException(env, err)){ */
-/*     return; */
-/*   } */
-/*   gpgme_ctx_t waitedOn = gpgme_wait(CONTEXT(context), err, 1);//HANG UNTIL COMPLETED! */
-/*   if(waitedOn != NULL && UTILS_onErrorThrowException(env, err)){ */
-/*     return; */
-/*   } */
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeRelease(JNIEnv * env, jobject self,
-						  jlong context)
-{
-    gpgme_release(CONTEXT(context));
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpEncryptSign(JNIEnv * env,
-							jobject self,
-							jlong context,
-							jlongArray recipients,
-							jlong plain,
-							jlong cipher)
-{
-    gpgme_error_t err;
-
-    gpgme_set_passphrase_cb(CONTEXT(context), passphrase_cb, self);
-
-    jsize len = (*env)->GetArrayLength(env, recipients);
-    gpgme_key_t keys[len + 1];
-    if (UTILS_copyRecipientsFromJvm(env, recipients, keys) < 1) {
-	return;
-    }
-
-    err = gpgme_data_rewind(DATA(plain));	//TODO: Use seek instead of rewind
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    err = gpgme_data_rewind(DATA(cipher));	//TODO: Use seek instead of rewind
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    err = gpgme_op_encrypt_sign(CONTEXT(context), keys,
-				GPGME_ENCRYPT_ALWAYS_TRUST, DATA(plain),
-				DATA(cipher));
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-/*   err = gpgme_op_encrypt_sign_start(CONTEXT(context), keys, GPGME_ENCRYPT_ALWAYS_TRUST, (gpgme_data_t)plain, (gpgme_data_t)cipher); */
-/*   if(UTILS_onErrorThrowException(env, err)){ */
-/*     return; */
-/*   } */
-/*   gpgme_ctx_t waitedOn = gpgme_wait(CONTEXT(context), err, 1);//HANG UNTIL COMPLETED! */
-/*   if(waitedOn != NULL && UTILS_onErrorThrowException(env, err)){ */
-/*     return; */
-/*   } */
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpDecryptVerify(JNIEnv * env,
-							  jobject self,
-							  jlong context,
-							  jlong cipher,
-							  jlong plain)
-{
-    gpgme_error_t err;
-
-    gpgme_set_passphrase_cb(CONTEXT(context), passphrase_cb, self);
-
-    err = gpgme_data_rewind(DATA(cipher));	//TODO: Use seek instead of rewind
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    err = gpgme_data_rewind(DATA(plain));	//TODO: Use seek instead of rewind
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    err = gpgme_op_decrypt_verify(CONTEXT(context), DATA(cipher), DATA(plain));
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-/*   err = gpgme_op_decrypt_verify_start(CONTEXT(context), (gpgme_data_t)cipher, (gpgme_data_t)plain); */
-/*   if(UTILS_onErrorThrowException(env, err)){ */
-/*     return; */
-/*   } */
-/*   gpgme_ctx_t waitedOn = gpgme_wait(CONTEXT(context), err, 1);//HANG UNTIL COMPLETED! */
-/*   if(waitedOn != NULL && UTILS_onErrorThrowException(env, err)){ */
-/*     return; */
-/*   } */
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpSign(JNIEnv * env, jobject self,
-						 jlong context, jlong plain,
-						 jlong signature)
-{
-    gpgme_error_t err;
-
-    gpgme_set_passphrase_cb(CONTEXT(context), passphrase_cb, (void *) self);
-
-    err = gpgme_data_rewind(DATA(plain));	//TODO: Use seek instead of rewind
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    err = gpgme_data_rewind(DATA(signature));	//TODO: Use seek instead of rewind
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    err = gpgme_op_sign(CONTEXT(context), DATA(plain), DATA(signature),
-			GPGME_SIG_MODE_CLEAR);
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-/*   err = gpgme_op_sign_start(CONTEXT(context), (gpgme_data_t)plain, (gpgme_data_t)signature, GPGME_SIG_MODE_NORMAL); */
-/*   if(UTILS_onErrorThrowException(env, err)){ */
-/*     return; */
-/*   } */
-
-/*   gpgme_ctx_t waitedOn = gpgme_wait(CONTEXT(context), err, 0); */
-/*   if(waitedOn != NULL && UTILS_onErrorThrowException(env, err)){ */
-/*     return; */
-/*   } */
-
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpVerify(JNIEnv * env, jobject self,
-						   jlong context,
-						   jlong signature,
-						   jlong signedtxt, jlong plain)
-{
-    gpgme_error_t err;
-
-    gpgme_set_passphrase_cb(CONTEXT(context), passphrase_cb, self);
-
-    err = gpgme_data_rewind(DATA(signature));	//TODO: Use seek instead of rewind
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    err = gpgme_data_rewind(DATA(signedtxt));	//TODO: Use seek instead of rewind
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    err = gpgme_data_rewind(DATA(plain));	//TODO: Use seek instead of rewind
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    err = gpgme_op_verify(CONTEXT(context), DATA(signature), DATA(signedtxt),
-			  DATA(plain));
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-/*   err = gpgme_op_verify_start(CONTEXT(context), (gpgme_data_t)signature, (gpgme_data_t)signedtxt, (gpgme_data_t)plain); */
-/*   if(UTILS_onErrorThrowException(env, err)){ */
-/*     return; */
-/*   } */
-/*   gpgme_ctx_t waitedOn = gpgme_wait(CONTEXT(context), err, 0); */
-/*   if(waitedOn != NULL && UTILS_onErrorThrowException(env, err)){ */
-/*     return; */
-/*   } */
-}
-
-JNIEXPORT jobjectArray JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeKeylist(JNIEnv * env, jobject self,
-						  jlong context, jstring query)
-{
-    gpgme_error_t err;
-    gpgme_key_t key;
-    jlong num_keys_found = 0;
-    jobjectArray result = NULL;
-    jobject keyObj = NULL;
-
-    //copy string object from java to native string
-    const jbyte *query_str = (jbyte *)(*env)->GetStringUTFChars(env, query,
-								NULL);
-
-    //get the right constructor to invoke for every key in result set
-    jclass keyClass;
-    keyClass = (*env)->FindClass(env, "com/freiheit/gnupg/GnuPGKey");
-    if (keyClass == NULL) {
-	return NULL;
-    }
-    jmethodID cid;
-    //get the constructor, that accepts a long as param (that is a ptr to a key)..
-    cid = (*env)->GetMethodID(env, keyClass, "<init>", "(J)V");
-    if (cid == NULL) {
-	return NULL;
-    }
-    //loop two times: one for counting, second for generating result array
-    int is_counting = 0;	//loop 1: counting number of keys in result
-    int is_working = 1;		//loop 2: generating result array
-
-    int i = 0;			//loop counter
-    int j = 0;			//index in result array, used only in second loop run...
-    for (i = 0; i < 2; i++) {	//loops [0..1]
-	err = gpgme_op_keylist_start(CONTEXT(context),
-				     (const char *)query_str,
-				     0);
-	if (UTILS_onErrorThrowException(env, err)) {
-	    (*env)->ReleaseStringUTFChars(env, query, (const char *)query_str);
-	    return NULL;
-	}
-
-	while (!err) {
-	    err = gpgme_op_keylist_next(CONTEXT(context), &key);
-	    if ((gpg_err_code(err) != GPG_ERR_EOF) 
-		&& UTILS_onErrorThrowException(env, err)) {
-		return NULL;
-	    }
-
-	    if (is_counting == i && key != NULL) {	//only true in first loop: i=0
-		num_keys_found++;	//increment result count
-		gpgme_key_release(key);
-	    } else if (is_working == i && key != NULL) {	//only true in second loop: i=1
-		if (result == NULL) {
-		    result = (*env)->NewObjectArray(env,
-						    num_keys_found,
-						    keyClass,
-						    NULL);
-		}
-		keyObj = (*env)->NewObject(env, keyClass, cid, LNG(key));
-		(*env)->SetObjectArrayElement(env, result, j++, keyObj);
-	    } else {
-		//FIXME: Can not happen...but should be checked -> throwing exception?
-	    }
-	    key = NULL;
-
-	}			//end while
-
-    }				//end for
-
-    //..and release the query string for gc..
-    (*env)->ReleaseStringUTFChars(env, query, (const char *) query_str);
-
-    return result;
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeAddSigners(JNIEnv * env, jobject self,
-						     jlong context, jlong key)
-{
-    gpgme_error_t err;
-    err = gpgme_signers_add(CONTEXT(context), KEY(key));
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeClearSigners(JNIEnv * env,
-						       jobject self,
-						       jlong context)
-{
-    gpgme_signers_clear(CONTEXT(context));
-}
-
-void check_result(gpgme_import_result_t result, char *fpr, int secret)
-{
-    //TODO: Throw exception for possible errors...
-    if (result->considered != 1) {
-	fprintf(stderr, "Unexpected number of considered keys %i\n",
-		result->considered);
-    }
-
-    if (result->no_user_id != 0) {
-	fprintf(stderr, "Unexpected number of user ids %i\n",
-		result->no_user_id);
-    }
-
-    if ((secret && result->imported != 0)
-	|| (!secret && (result->imported != 0 && result->imported != 1))) {
-	fprintf(stderr, "Unexpected number of imported keys %i\n",
-		result->imported);
-    }
-
-    if (result->imported_rsa != 0) {
-	fprintf(stderr, "Unexpected number of imported RSA keys %i\n",
-		result->imported_rsa);
-    }
-
-    if ((secret && result->unchanged != 0)
-	|| (!secret && ((result->imported == 0 && result->unchanged != 1)
-			|| (result->imported == 1 && result->unchanged != 0)))) {
-	fprintf(stderr, "Unexpected number of unchanged keys %i\n",
-		result->unchanged);
-    }
-
-    if (result->new_user_ids != 0) {
-	fprintf(stderr, "Unexpected number of new user IDs %i\n",
-		result->new_user_ids);
-    }
-
-    if (result->new_sub_keys != 0) {
-	fprintf(stderr, "Unexpected number of new sub keys %i\n",
-		result->new_sub_keys);
-    }
-
-    if ((secret
-	 && ((result->secret_imported == 0 && result->new_signatures != 0)
-	     || (result->secret_imported == 1 && result->new_signatures > 1)))
-	|| (!secret && result->new_signatures != 0)) {
-	fprintf(stderr, "Unexpected number of new signatures %i\n",
-		result->new_signatures);
-	if (result->new_signatures == 2) {
-	    fprintf(stderr, "### ignored due to gpg 1.3.4 problems\n");
-	} else {
-	    //exit (1);
-	}
-    }
-
-    if (result->new_revocations != 0) {
-	fprintf(stderr, "Unexpected number of new revocations %i\n",
-		result->new_revocations);
-    }
-
-    if ((secret && result->secret_read != 1)
-	|| (!secret && result->secret_read != 0)) {
-	fprintf(stderr, "Unexpected number of secret keys read %i\n",
-		result->secret_read);
-    }
-
-    if ((secret && result->secret_imported != 0 && result->secret_imported != 1)
-	|| (!secret && result->secret_imported != 0)) {
-	fprintf(stderr, "Unexpected number of secret keys imported %i\n",
-		result->secret_imported);
-    }
-
-    if ((secret
-	 && ((result->secret_imported == 0 && result->secret_unchanged != 1)
-	     || (result->secret_imported == 1
-		 && result->secret_unchanged != 0)))
-	|| (!secret && result->secret_unchanged != 0)) {
-	fprintf(stderr, "Unexpected number of secret keys unchanged %i\n",
-		result->secret_unchanged);
-    }
-
-    if (result->not_imported != 0) {
-	fprintf(stderr, "Unexpected number of secret keys not imported %i\n",
-		result->not_imported);
-    }
-
-    if (secret) {
-	if (!result->imports
-	    || (result->imports->next && result->imports->next->next)) {
-	    fprintf(stderr, "Unexpected number of status reports\n");
-	}
-    } else if (!result->imports || result->imports->next) {
-        fprintf(stderr, "Unexpected number of status reports\n");
-    }
-
-    if (strcmp(fpr, result->imports->fpr)) {
-	fprintf(stderr, "Unexpected fingerprint %s\n", result->imports->fpr);
-    }
-
-    if (result->imports->next && strcmp(fpr, result->imports->next->fpr)) {
-	fprintf(stderr, "Unexpected fingerprint on second status %s\n",
-		result->imports->next->fpr);
-    }
-
-    if (result->imports->result != 0) {
-	fprintf(stderr, "Unexpected status result %s\n",
-		gpgme_strerror(result->imports->result));
-    }
-
-    if (secret) {
-	if (result->secret_imported == 0) {
-	    if (result->imports->status != GPGME_IMPORT_SECRET) {
-		fprintf(stderr, "Unexpected status %i\n",
-			result->imports->status);
-	    }
-	} else if (result->imports->status
-		!= (GPGME_IMPORT_SECRET | GPGME_IMPORT_NEW)
-		|| (result->imports->next
-		    && result->imports->next->status != GPGME_IMPORT_SIG)) {
-	    fprintf(stderr, "Unexpected status %i\n", result->imports->status);
-	}
-    } else if ((result->imported == 0 && result->imports->status != 0)
-	    || (result->imported == 1
-		&& result->imports->status != GPGME_IMPORT_NEW)) {
-        fprintf(stderr, "Unexpected status %i\n", result->imports->status);
-    }
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpImport(JNIEnv * env, jobject self,
-						   jlong context, jlong keydata)
-{
-    gpgme_error_t err;
-    gpgme_import_result_t result;
-
-    err = gpgme_data_rewind(DATA(keydata));	//TODO: Use seek instead of rewind
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    err = gpgme_op_import(CONTEXT(context), DATA(keydata));
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-    result = gpgme_op_import_result(CONTEXT(context));
-    if (result == NULL) {
-	if (UTILS_onErrorThrowException(env, GPG_ERR_NO_PUBKEY))
-	    return;
-    } else if (result->imported != 1 || result->not_imported != 0) {
-        if (result->imports == NULL) {
-            fprintf(stderr,
-                    "result->imports == NULL, result->imported = %d, result->not_imported = %d\n",
-                    result->imported, result->not_imported);
-            if (UTILS_onErrorThrowException(env, GPG_ERR_UNUSABLE_PUBKEY)) {
-                return;
-            }
-        } else {
-            fprintf(stderr,
-                    "result->imports != NULL, result->imported = %d, result->not_imported = %d\n",
-                    result->imported, result->not_imported);
-            if (UTILS_onErrorThrowException(env, result->imports->result)) {
-                return;
-            }
-        }
-    }
-    //TODO: Check result and throw exceptions
-    //check_result (result, "ADAB7FCC1F4DE2616ECFA402AF82244F9CD9FD55", 0);
-}
-
-JNIEXPORT jlong JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeGetArmor(JNIEnv * env, jobject self,
-						   jlong context)
-{
-    return (jlong) gpgme_get_armor(CONTEXT(context));
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeSetArmor(JNIEnv * env, jobject self,
-						   jlong context,
-						   jlong armor_state)
-{
-    gpgme_set_armor(CONTEXT(context), (int) armor_state);
-}
-
-JNIEXPORT jlong JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeGetTextmode(JNIEnv * env,
-						      jobject self,
-						      jlong context)
-{
-    return (jlong) gpgme_get_textmode(CONTEXT(context));
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeSetTextmode(JNIEnv * env,
-						      jobject self,
-						      jlong context, jlong mode)
-{
-    gpgme_set_textmode(CONTEXT(context), (int) mode);
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpGenKey(JNIEnv * env, jobject self,
-						   jlong context,
-						   jstring params)
-{
-
-    gpgme_ctx_t ctx = CONTEXT(context);
-    char *p;
-    gpgme_error_t err;
-
-    p = (char *) (*env)->GetStringUTFChars(env, params, NULL);
-
-    fprintf(stderr, "genKey: \"%s\"\n", p);
-
-    err = gpgme_op_genkey(ctx, p, NULL, NULL);
-
-    (*env)->ReleaseStringUTFChars(env, params, p);
-
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-}
-
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpExport(JNIEnv * env, jobject self,
-						   jlong context,
-						   jstring pattern,
-						   jlong reserved,
-						   jlong keydata)
-{
-
-    gpgme_ctx_t ctx = CONTEXT(context);
-    char *p;
-    gpgme_data_t data = DATA(keydata);
-    gpgme_error_t err;
-
-
-    p = (char *) (*env)->GetStringUTFChars(env, pattern, NULL);
-    err = gpgme_op_export(ctx, p, 0, data);
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-    (*env)->ReleaseStringUTFChars(env, pattern, p);
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeCtxSetEngineInfo(JNIEnv * env,
-							   jobject self,
-							   jlong ctx,
-							   jint proto,
-							   jstring fileName,
-							   jstring homeDir)
-{
-
-    gpgme_ctx_t context = CONTEXT(ctx);
-    gpgme_protocol_t protocol = (gpgme_protocol_t) proto;
-    char *file_name;
-    char *home_dir;
-    gpgme_error_t err;
-
-    file_name = (char *) (*env)->GetStringUTFChars(env, fileName, NULL);
-    home_dir = (char *) (*env)->GetStringUTFChars(env, homeDir, NULL);
-
-
-    /*fprintf(stderr, "set engine info: proto: %d, fileName: %s, homeDir: %s\n", proto, file_name, home_dir);*/
-    err = gpgme_ctx_set_engine_info(context, protocol, file_name, home_dir);
-
-    (*env)->ReleaseStringUTFChars(env, fileName, file_name);
-    (*env)->ReleaseStringUTFChars(env, homeDir, home_dir);
-
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-}
-
-
-JNIEXPORT jobject JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpGenkeyResult(JNIEnv * env,
-							 jobject self,
-							 jlong ctx)
-{
-
-    gpgme_ctx_t context = CONTEXT(ctx);
-    gpgme_genkey_result_t result = gpgme_op_genkey_result(context);
-    jobject resultObj;
-
-    if (result == NULL) {
-	return NULL;
-    }
-    //get the right constructor to invoke for every key in result set
-    jclass resultClass;
-    resultClass =
-	(*env)->FindClass(env, "com/freiheit/gnupg/GnuPGGenkeyResult");
-
-    if (resultClass == NULL) {
-	return NULL;
-    }
-
-    jmethodID cid;
-    cid = (*env)->GetMethodID(env, resultClass, "<init>", "()V");
-    if (cid == NULL) {
-	return NULL;
-    }
-
-    resultObj = (*env)->NewObject(env, resultClass, cid);
-
-    UTILS_setStringMember(env, resultObj, resultClass, "_fpr", result->fpr);
-    UTILS_setBooleanMember(env, resultObj, resultClass, "_primary",
-			   result->primary);
-    UTILS_setBooleanMember(env, resultObj, resultClass, "_sub", result->sub);
-
-    return resultObj;
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpDelete(JNIEnv * env, jobject self,
-						   jlong ctx, jlong key,
-						   jboolean allowSecret)
-{
-
-    gpgme_ctx_t context = CONTEXT(ctx);
-    gpgme_key_t deletekey = KEY(key);
-    unsigned int sec = (unsigned int) allowSecret;
-    gpgme_error_t err;
-
-
-    err = gpgme_op_delete(context, deletekey, sec);
-
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-}
diff --git a/src/c/GnuPGData.c b/src/c/GnuPGData.c
deleted file mode 100644
index 0d61ee3..0000000
--- a/src/c/GnuPGData.c
+++ /dev/null
@@ -1,153 +0,0 @@
-#include <jni.h>
-#include <stdio.h>
-
-#include "com_freiheit_gnupg_GnuPGData.h"
-#include "gpgmeutils.h"
-
-#include <gpgme.h>
-
-#define BUFSIZE 1024
-
-JNIEXPORT jlong JNICALL
-Java_com_freiheit_gnupg_GnuPGData_gpgmeDataNewFromMem(JNIEnv * env,
-						      jobject self,
-						      jbyteArray plain)
-{
-    gpgme_error_t err;
-
-    jbyte *plain_ptr = (*env)->GetByteArrayElements(env, plain, NULL);	//GETMEM(0)
-    if (plain_ptr == NULL) {
-        fprintf(stderr, "could not allocate memory.\n");
-	return 0;
-    }
-
-    gpgme_data_t data;
-    jlong len = (*env)->GetArrayLength(env, plain);
-
-    //make private copy of data
-    err = gpgme_data_new_from_mem(&data, (const char *) plain_ptr,
-				  (size_t) len, 1);
-    if (UTILS_onErrorThrowException(env, err)) {
-	return LNG(NULL);
-    }
-
-    (*env)->ReleaseByteArrayElements(env, plain, plain_ptr, 0);	//RELMEM(0)
-    jlong result = LNG(data);
-    return result;
-}
-
-JNIEXPORT jlong JNICALL
-Java_com_freiheit_gnupg_GnuPGData_gpgmeDataNew(JNIEnv * env, jobject self)
-{
-    gpgme_data_t data;
-    gpgme_error_t err = gpgme_data_new(&data);
-    if (UTILS_onErrorThrowException(env, err)) {
-	return LNG(NULL);
-    }
-
-    return LNG(data);
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGData_gpgmeDataWrite(JNIEnv * env, jobject self,
-						 jlong data, jobject out)
-{
-    gpgme_error_t err;
-
-    jbyte buf[BUFSIZE];
-    size_t nread;
-
-    jclass outputStream = (*env)->GetObjectClass(env, out);
-    if (outputStream == NULL) {
-        fprintf(stderr, "output stream NULL! abort.\n");
-	return;
-    }
-
-    jmethodID writeMethod =
-	(*env)->GetMethodID(env, outputStream, "write", "([BII)V");
-    if (writeMethod == NULL) {
-        fprintf(stderr, "write method NULL! abort.\n");
-	return;
-    }
-
-    jbyteArray jbuf;
-
-    err = (gpgme_data_seek ( DATA(data), (off_t)0, SEEK_SET ) < 0);
-    if (UTILS_onErrorThrowException(env, err)) {
-	fprintf(stderr, "error throw exception! abort.\n");
-	return;
-    }
-
-    int size = 0;
-    while ((nread = gpgme_data_read(DATA(data), buf, BUFSIZE)) != 0) {
-        size += nread;
-	jbuf = (*env)->NewByteArray(env, nread);
-	if (jbuf == NULL) {
-	    fprintf(stderr, "jbuf is NULL! abort.\n");
-	    return;
-	}
-	(*env)->SetByteArrayRegion(env, jbuf, 0, nread, buf);
-	(*env)->CallVoidMethod(env, out, writeMethod, jbuf, (jint)0,
-			       (jint)nread);
-	if ((*env)->ExceptionCheck(env)) {
-	    (*env)->DeleteLocalRef(env, jbuf);
-	    return;
-	}
-	(*env)->DeleteLocalRef(env, jbuf);
-    }
-
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGData_gpgmeDataRelease(JNIEnv * env, jobject self,
-						   jlong data)
-{
-    gpgme_data_release(DATA(data));
-}
-
-JNIEXPORT void JNICALL
-Java_com_freiheit_gnupg_GnuPGData_gpgmeDataRead(JNIEnv * env, jobject self,
-						jlong data, jobject in)
-{
-    gpgme_error_t err;
-
-    jclass inputStream = (*env)->GetObjectClass(env, in);
-    if (inputStream == NULL) {
-        fprintf(stderr, "input stream NULL! abort.\n");
-	return;
-    }
-
-    jmethodID readMethod = (*env)->GetMethodID(env, inputStream,
-					       "read", "([BII)I");
-    if (readMethod == NULL) {
-        fprintf(stderr, "read method NULL! abort.\n");
-	return;
-    }
-
-    jbyteArray jbuf = (*env)->NewByteArray(env, BUFSIZE);	//GETMEM(0)
-    jlong nread;
-
-    err = (gpgme_data_seek (DATA(data), (off_t)0, SEEK_SET) < 0);
-    if (UTILS_onErrorThrowException(env, err)) {
-	return;
-    }
-
-    ssize_t written;
-    while ((nread = (*env)->CallIntMethod(env, in, readMethod,
-					  jbuf, (jint)0, BUFSIZE)) != -1) {
-
-	jbyte *buf = (*env)->GetByteArrayElements(env, jbuf, NULL);
-	if (buf == NULL) {
-	    return;
-	}
-
-	written = gpgme_data_write(DATA(data), buf, nread);
-	if ((*env)->ExceptionCheck(env)) {
-	    (*env)->DeleteLocalRef(env, jbuf);
-	    return;
-	}
-
-    }
-    (*env)->DeleteLocalRef(env, jbuf);	//RELMEM(0)
-
-}
diff --git a/src/c/GnuPGKey.c b/src/c/GnuPGKey.c
deleted file mode 100644
index b8e6bcc..0000000
--- a/src/c/GnuPGKey.c
+++ /dev/null
@@ -1,127 +0,0 @@
-#include <jni.h>
-#include <stdio.h>
-#include "com_freiheit_gnupg_GnuPGKey.h"
-#include "gpgmeutils.h"
-
-#include <gpgme.h>
-
-
-JNIEXPORT jlong JNICALL
-Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetKey(JNIEnv * env, jobject self,
-					     jlong context, jstring fingerprint)
-{
-    gpgme_key_t key;
-
-    const char *fpr = (*env)->GetStringUTFChars(env, fingerprint, NULL);
-    gpgme_error_t err = gpgme_get_key(CONTEXT(context), fpr, &key, 0);
-    if (UTILS_onErrorThrowException(env, err)) {
-	(*env)->ReleaseStringUTFChars(env, fingerprint, fpr);
-	return LNG(NULL);
-    }
-    (*env)->ReleaseStringUTFChars(env, fingerprint, fpr);
-
-    //setMembers(env, self, key);
-
-    return LNG(key);
-}
-
-JNIEXPORT jlong JNICALL
-Java_com_freiheit_gnupg_GnuPGKey_gpgmeKeyUnref(JNIEnv * env, jobject self,
-					       jlong key)
-{
-    gpgme_key_unref(KEY(key));
-    return 0l;
-}
-
-JNIEXPORT jstring JNICALL
-Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetName(JNIEnv * env, jobject self,
-					      jlong key)
-{
-    jstring str = (*env)->NewStringUTF(env, (KEY(key))->uids->name);
-    return str;
-}
-
-JNIEXPORT jstring JNICALL
-Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetEmail(JNIEnv * env, jobject self,
-					       jlong key)
-{
-    jstring str = (*env)->NewStringUTF(env, (KEY(key))->uids->email);
-    return str;
-}
-
-JNIEXPORT jstring JNICALL
-Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetKeyID(JNIEnv * env, jobject self,
-					       jlong key)
-{
-    jstring str = (*env)->NewStringUTF(env, (KEY(key))->subkeys->keyid);
-    return str;
-}
-
-JNIEXPORT jstring JNICALL
-Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetFingerprint(JNIEnv * env, jobject self,
-						     jlong key)
-{
-    jstring str = (*env)->NewStringUTF(env, (KEY(key))->subkeys->fpr);
-    return str;
-}
-
-JNIEXPORT jstring JNICALL
-Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetComment(JNIEnv * env, jobject self,
-						 jlong key)
-{
-    jstring str = (*env)->NewStringUTF(env, (KEY(key))->uids->comment);
-    return str;
-}
-
-JNIEXPORT jstring JNICALL
-Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetUserID(JNIEnv * env, jobject self,
-						jlong key)
-{
-    jstring str = (*env)->NewStringUTF(env, (KEY(key))->uids->uid);
-    return str;
-}
-
-
-JNIEXPORT jlong JNICALL
-Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetSignature(JNIEnv * env, jobject self,
-						   jlong key)
-{
-    return LNG((KEY(key))->uids->signatures);
-}
-
-/* void */
-/* setMembers(JNIEnv *env, jobject self, gpgme_key_t key){ */
-/*   jclass cls = (*env)->GetObjectClass(env, self); */
-
-/*   jfieldID uid_fld = (*env)->GetFieldID(env, cls, "_uid", "Ljava/lang/String;"); */
-/*   if(uid_fld == NULL) return; */
-/*   jfieldID name_fld = (*env)->GetFieldID(env, cls, "_name", "Ljava/lang/String;"); */
-/*   if(name_fld == NULL) return; */
-/*   jfieldID email_fld = (*env)->GetFieldID(env, cls, "_email", "Ljava/lang/String;"); */
-/*   if(email_fld == NULL) return; */
-/*   jfieldID keyid_fld = (*env)->GetFieldID(env, cls, "_keyid", "Ljava/lang/String;"); */
-/*   if(keyid_fld == NULL) return; */
-/*   jfieldID fpr_fld = (*env)->GetFieldID(env, cls, "_fpr", "Ljava/lang/String;"); */
-/*   if(fpr_fld == NULL) return; */
-
-/*   jstring uid_jstr = (*env)->NewStringUTF(env, key->uids->uid); */
-/*   if(uid_jstr == NULL) return; */
-/*   (*env)->SetObjectField(env, self, uid_fld, uid_jstr); */
-
-/*   jstring name_jstr = (*env)->NewStringUTF(env, key->uids->name); */
-/*   if(name_jstr == NULL) return; */
-/*   (*env)->SetObjectField(env, self, name_fld, name_jstr); */
-
-/*   jstring email_jstr = (*env)->NewStringUTF(env, key->uids->email); */
-/*   if(email_jstr == NULL) return; */
-/*   (*env)->SetObjectField(env, self, email_fld, email_jstr); */
-
-/*   jstring keyid_jstr = (*env)->NewStringUTF(env, key->subkeys->keyid); */
-/*   if(keyid_jstr == NULL) return; */
-/*   (*env)->SetObjectField(env, self, keyid_fld, keyid_jstr); */
-
-/*   jstring fpr_jstr = (*env)->NewStringUTF(env, key->subkeys->fpr); */
-/*   if(fpr_jstr == NULL) return; */
-/*   (*env)->SetObjectField(env, self, fpr_fld, fpr_jstr); */
-
-/* } */
diff --git a/src/c/GnuPGSignature.c b/src/c/GnuPGSignature.c
deleted file mode 100644
index ef63479..0000000
--- a/src/c/GnuPGSignature.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include <jni.h>
-#include <stdio.h>
-#include "com_freiheit_gnupg_GnuPGSignature.h"
-#include "gpgmeutils.h"
-
-#include <gpgme.h>
-
-JNIEXPORT jboolean JNICALL
-Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetRevoked(JNIEnv * env,
-						       jobject self, jlong sig)
-{
-    return (jboolean) (KEYSIG(sig))->revoked;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetExpired(JNIEnv * env,
-						       jobject self, jlong sig)
-{
-    return (jboolean) (KEYSIG(sig))->expired;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetInvalid(JNIEnv * env,
-						       jobject self, jlong sig)
-{
-    return (jboolean) (KEYSIG(sig))->invalid;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetExportable(JNIEnv * env,
-							  jobject self,
-							  jlong sig)
-{
-    return (jboolean) (KEYSIG(sig))->exportable;
-}
-
-JNIEXPORT jstring JNICALL
-Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetKeyID(JNIEnv * env, jobject self,
-						     jlong sig)
-{
-    jstring str = (*env)->NewStringUTF(env, (KEYSIG(sig))->keyid);
-    return str;
-}
-
-JNIEXPORT jstring JNICALL
-Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetUserID(JNIEnv * env,
-						      jobject self, jlong sig)
-{
-    jstring str = (*env)->NewStringUTF(env, (KEYSIG(sig))->uid);
-    return str;
-}
-
-JNIEXPORT jstring JNICALL
-Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetName(JNIEnv * env, jobject self,
-						    jlong sig)
-{
-    jstring str = (*env)->NewStringUTF(env, (KEYSIG(sig))->name);
-    return str;
-}
-
-JNIEXPORT jstring JNICALL
-Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetEmail(JNIEnv * env, jobject self,
-						     jlong sig)
-{
-    jstring str = (*env)->NewStringUTF(env, (KEYSIG(sig))->email);
-    return str;
-}
-
-JNIEXPORT jstring JNICALL
-Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetComment(JNIEnv * env,
-						       jobject self, jlong sig)
-{
-    jstring str = (*env)->NewStringUTF(env, (KEYSIG(sig))->comment);
-    return str;
-}
-
-JNIEXPORT jlong JNICALL
-Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetNextSignature(JNIEnv * env,
-							     jobject self,
-							     jlong sig)
-{
-    return LNG((KEYSIG(sig))->next);
-}
diff --git a/src/c/com_freiheit_gnupg_GnuPGContext.h b/src/c/com_freiheit_gnupg_GnuPGContext.h
deleted file mode 100644
index 6c54f5c..0000000
--- a/src/c/com_freiheit_gnupg_GnuPGContext.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_freiheit_gnupg_GnuPGContext */
-
-#ifndef _Included_com_freiheit_gnupg_GnuPGContext
-#define _Included_com_freiheit_gnupg_GnuPGContext
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeCheckVersion
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeCheckVersion
-  (JNIEnv *, jclass);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeGetEngineInfo
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeGetEngineInfo
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeNew
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeNew
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeOpEncrypt
- * Signature: (J[JJJ)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpEncrypt
-  (JNIEnv *, jobject, jlong, jlongArray, jlong, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeOpDecrypt
- * Signature: (JJJ)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpDecrypt
-  (JNIEnv *, jobject, jlong, jlong, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeOpChangePassphrase
- * Signature: (JJ)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpChangePassphrase
-  (JNIEnv *, jobject, jlong, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeRelease
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeRelease
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeOpEncryptSign
- * Signature: (J[IJJ)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpEncryptSign
-  (JNIEnv *, jobject, jlong, jintArray, jlong, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeOpDecryptVerify
- * Signature: (JJJ)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpDecryptVerify
-  (JNIEnv *, jobject, jlong, jlong, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeOpSign
- * Signature: (JJJ)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpSign
-  (JNIEnv *, jobject, jlong, jlong, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeOpVerify
- * Signature: (JJJJ)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpVerify
-  (JNIEnv *, jobject, jlong, jlong, jlong, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeKeylist
- * Signature: (JLjava/lang/String;)[Lcom/freiheit/gnupg/GnuPGKey;
- */
-JNIEXPORT jobjectArray JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeKeylist
-  (JNIEnv *, jobject, jlong, jstring);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeAddSigners
- * Signature: (JJ)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeAddSigners
-  (JNIEnv *, jobject, jlong, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeClearSigners
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeClearSigners
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeOpImport
- * Signature: (JJ)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpImport
-  (JNIEnv *, jobject, jlong, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeOpExport
- * Signature: (JLjava/lang/String;JJ)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpExport
-  (JNIEnv *, jobject, jlong, jstring, jlong, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeOpGenKey
- * Signature: (JLjava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpGenKey
-  (JNIEnv *, jobject, jlong, jstring);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeCtxSetEngineInfo
- * Signature: (JILjava/lang/String;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeCtxSetEngineInfo
-  (JNIEnv *, jobject, jlong, jint, jstring, jstring);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeOpGenkeyResult
- * Signature: (J)Lcom/freiheit/gnupg/GnuPGGenkeyResult;
- */
-JNIEXPORT jobject JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpGenkeyResult
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeOpDelete
- * Signature: (JJZ)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeOpDelete
-  (JNIEnv *, jobject, jlong, jlong, jboolean);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeGetArmor
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeGetArmor
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeSetArmor
- * Signature: (JJ)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeSetArmor
-  (JNIEnv *, jobject, jlong, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeGetTextmode
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeGetTextmode
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGContext
- * Method:    gpgmeSetTextmode
- * Signature: (JJ)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGContext_gpgmeSetTextmode
-  (JNIEnv *, jobject, jlong, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/c/com_freiheit_gnupg_GnuPGData.h b/src/c/com_freiheit_gnupg_GnuPGData.h
deleted file mode 100644
index 3245048..0000000
--- a/src/c/com_freiheit_gnupg_GnuPGData.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_freiheit_gnupg_GnuPGData */
-
-#ifndef _Included_com_freiheit_gnupg_GnuPGData
-#define _Included_com_freiheit_gnupg_GnuPGData
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     com_freiheit_gnupg_GnuPGData
- * Method:    gpgmeDataNewFromMem
- * Signature: ([B)J
- */
-JNIEXPORT jlong JNICALL Java_com_freiheit_gnupg_GnuPGData_gpgmeDataNewFromMem
-  (JNIEnv *, jobject, jbyteArray);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGData
- * Method:    gpgmeDataNew
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_com_freiheit_gnupg_GnuPGData_gpgmeDataNew
-  (JNIEnv *, jobject);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGData
- * Method:    gpgmeDataWrite
- * Signature: (JLjava/io/OutputStream;)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGData_gpgmeDataWrite
-  (JNIEnv *, jobject, jlong, jobject);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGData
- * Method:    gpgmeDataRelease
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGData_gpgmeDataRelease
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGData
- * Method:    gpgmeDataRead
- * Signature: (JLjava/io/InputStream;)V
- */
-JNIEXPORT void JNICALL Java_com_freiheit_gnupg_GnuPGData_gpgmeDataRead
-  (JNIEnv *, jobject, jlong, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/c/com_freiheit_gnupg_GnuPGGenkeyResult.h b/src/c/com_freiheit_gnupg_GnuPGGenkeyResult.h
deleted file mode 100644
index f7297a2..0000000
--- a/src/c/com_freiheit_gnupg_GnuPGGenkeyResult.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_freiheit_gnupg_GnuPGGenkeyResult */
-
-#ifndef _Included_com_freiheit_gnupg_GnuPGGenkeyResult
-#define _Included_com_freiheit_gnupg_GnuPGGenkeyResult
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/c/com_freiheit_gnupg_GnuPGKey.h b/src/c/com_freiheit_gnupg_GnuPGKey.h
deleted file mode 100644
index 793eae3..0000000
--- a/src/c/com_freiheit_gnupg_GnuPGKey.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_freiheit_gnupg_GnuPGKey */
-
-#ifndef _Included_com_freiheit_gnupg_GnuPGKey
-#define _Included_com_freiheit_gnupg_GnuPGKey
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     com_freiheit_gnupg_GnuPGKey
- * Method:    gpgmeGetKey
- * Signature: (JLjava/lang/String;)J
- */
-JNIEXPORT jlong JNICALL Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetKey
-  (JNIEnv *, jobject, jlong, jstring);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGKey
- * Method:    gpgmeKeyUnref
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_com_freiheit_gnupg_GnuPGKey_gpgmeKeyUnref
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGKey
- * Method:    gpgmeGetName
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetName
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGKey
- * Method:    gpgmeGetEmail
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetEmail
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGKey
- * Method:    gpgmeGetKeyID
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetKeyID
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGKey
- * Method:    gpgmeGetFingerprint
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetFingerprint
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGKey
- * Method:    gpgmeGetComment
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetComment
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGKey
- * Method:    gpgmeGetUserID
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetUserID
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGKey
- * Method:    gpgmeGetSignature
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_com_freiheit_gnupg_GnuPGKey_gpgmeGetSignature
-  (JNIEnv *, jobject, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/c/com_freiheit_gnupg_GnuPGSignature.h b/src/c/com_freiheit_gnupg_GnuPGSignature.h
deleted file mode 100644
index e5fe53e..0000000
--- a/src/c/com_freiheit_gnupg_GnuPGSignature.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_freiheit_gnupg_GnuPGSignature */
-
-#ifndef _Included_com_freiheit_gnupg_GnuPGSignature
-#define _Included_com_freiheit_gnupg_GnuPGSignature
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     com_freiheit_gnupg_GnuPGSignature
- * Method:    gpgmeGetRevoked
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetRevoked
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGSignature
- * Method:    gpgmeGetExpired
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetExpired
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGSignature
- * Method:    gpgmeGetInvalid
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetInvalid
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGSignature
- * Method:    gpgmeGetExportable
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetExportable
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGSignature
- * Method:    gpgmeGetKeyID
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetKeyID
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGSignature
- * Method:    gpgmeGetUserID
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetUserID
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGSignature
- * Method:    gpgmeGetName
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetName
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGSignature
- * Method:    gpgmeGetEmail
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetEmail
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGSignature
- * Method:    gpgmeGetComment
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetComment
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     com_freiheit_gnupg_GnuPGSignature
- * Method:    gpgmeGetNextSignature
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_com_freiheit_gnupg_GnuPGSignature_gpgmeGetNextSignature
-  (JNIEnv *, jobject, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/c/gpgmeutils.c b/src/c/gpgmeutils.c
deleted file mode 100644
index 2592534..0000000
--- a/src/c/gpgmeutils.c
+++ /dev/null
@@ -1,112 +0,0 @@
-#include "gpgmeutils.h"
-#include <stdio.h>
-
-#define BUF_LEN 1024
-
-jboolean
-UTILS_setStringMember(JNIEnv * env, jobject self, jclass selfclass,
-		      const char *fieldname, const char *fieldvalue)
-{
-    //get the field from the class
-    jfieldID fld =
-	(*env)->GetFieldID(env, selfclass, fieldname, "Ljava/lang/String;");
-    if (fld == NULL) {
-	return JNI_FALSE;
-    }
-
-    jstring jval = (*env)->NewStringUTF(env, fieldvalue);
-    if (jval == NULL) {
-	return JNI_FALSE;
-    }
-    (*env)->SetObjectField(env, self, fld, jval);
-    return JNI_TRUE;
-}
-
-jboolean
-UTILS_setIntMember(JNIEnv * env, jobject self, jclass selfclass,
-		   const char *fieldname, int fieldvalue)
-{
-    //get the field from the class
-
-    jlong jval = (jlong) fieldvalue;
-
-    jfieldID fld = (*env)->GetFieldID(env, selfclass, fieldname, "I");
-    if (fld == NULL) {
-	return JNI_FALSE;
-    }
-
-    if (jval == 0) {
-	return JNI_FALSE;
-    }
-    (*env)->SetIntField(env, self, fld, jval);
-    return JNI_TRUE;
-}
-
-void
-UTILS_setBooleanMember(JNIEnv * env, jobject self, jclass selfclass,
-		       const char *fieldname, unsigned int fieldvalue)
-{
-    //get the field from the class
-
-    jboolean jval = (jboolean) fieldvalue;
-
-    jfieldID fld = (*env)->GetFieldID(env, selfclass, fieldname, "Z");
-    if (fld == NULL) {
-	return;
-    }
-
-    if (jval == 0) {
-	return;
-    }
-    (*env)->SetBooleanField(env, self, fld, jval);
-}
-
-jboolean UTILS_onErrorThrowException(JNIEnv * env, gpgme_error_t err)
-{
-    if (err) {
-	char exceptionString[BUF_LEN];	/* this is enough */
-	int spaceUsed;
-	jclass exception =
-	    (*env)->FindClass(env, "com/freiheit/gnupg/GnuPGException");
-
-	if (exception == NULL) {
-	    return JNI_TRUE;
-	}
-	spaceUsed = snprintf(exceptionString, BUF_LEN, "%u: ", err);
-	gpgme_strerror_r(err, exceptionString + spaceUsed, BUF_LEN - spaceUsed);
-	(*env)->ThrowNew(env, exception, exceptionString);
-	(*env)->DeleteLocalRef(env, exception);
-	return JNI_TRUE;
-    } else {
-	return JNI_FALSE;
-    }
-}
-
-int
-UTILS_copyRecipientsFromJvm(JNIEnv * env, jlongArray recipients,
-			    gpgme_key_t keys[])
-{
-    //how many keys from recipients did we receive?
-    jsize len = (*env)->GetArrayLength(env, recipients);
-    if (len < 1) {
-	return len;
-    }
-
-    //allocate native memory from recipient keys
-    jlong *carr = (*env)->GetLongArrayElements(env, recipients, NULL);
-    if (carr == NULL) {
-	return -1;
-    }
-    //copy recipient keys to new array...
-    int i;
-    for (i = 0; i < len; i++) {
-	keys[i] = KEY(carr[i]);
-    }
-    //and mark the end of the array with a NULL.
-    keys[len] = NULL;
-
-    //release the memory allocated from the recipients key list
-    (*env)->ReleaseLongArrayElements(env, recipients, carr, 0);
-
-    return len;
-}
diff --git a/src/c/libjavagnupg.32.so b/src/c/libjavagnupg.32.so
deleted file mode 100755
index 0ef2597..0000000
Binary files a/src/c/libjavagnupg.32.so and /dev/null differ
diff --git a/src/c/libjavagnupg.64.so b/src/c/libjavagnupg.64.so
deleted file mode 100755
index 2f4f4e1..0000000
Binary files a/src/c/libjavagnupg.64.so and /dev/null differ
diff --git a/src/com/freiheit/gnupg/GnuPGContext.java b/src/com/freiheit/gnupg/GnuPGContext.java
new file mode 100644
index 0000000..5fd3b8e
--- /dev/null
+++ b/src/com/freiheit/gnupg/GnuPGContext.java
@@ -0,0 +1,856 @@
+/*
+ * $Id: GnuPGContext.java,v 1.4 2006/07/03 15:32:16 sneumann Exp $
+ * (c) Copyright 2005 freiheit.com technologies gmbh, Germany.
+ *
+ * This file is part of Java for GnuPG  (http://www.freiheit.com).
+ *
+ * Java for GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * Please see COPYING for the complete licence.
+ */
+
+package com.freiheit.gnupg;
+
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Start here, because for all operations, you first need to create a
+ * GnuPGContext. Use one context object for every single thread or (really) take
+ * care about synchronizing access to the context from different threads.
+ * <p>
+ * <em>How to create a context?</em>
+ * 
+ * <pre>
+ * {
+ *     &#064;code
+ *     GnuPGContext ctx = new GnuPGContext();
+ * }
+ * </pre>
+ * 
+ * @author Stefan Richter, stefan@freiheit.com
+ */
+
+public class GnuPGContext extends GnuPGPeer {
+    public static final String TAG = "GnuPGContext";
+    static {
+        System.loadLibrary("gnupg-for-java");
+    }
+
+    private String _version;
+    private String _filename;
+    private String _reqversion;
+    private int _protocol;
+
+    /** Creates a new Context (use on context for one thread!) */
+    public GnuPGContext() {
+        gpgmeGetEngineInfo();
+        setInternalRepresentation(gpgmeNew());
+    }
+
+    /**
+     * Returns the version of the underlying GPGME lib version.
+     * 
+     * @return library version as String (like "1.1.1")
+     */
+    public String getVersion() {
+        return _version;
+    }
+
+    /**
+     * Returns the executable gpg with path
+     * 
+     * @return gpg executable as String (like "/usr/bin/gpg")
+     */
+    public String getFilename() {
+        return _filename;
+    }
+
+    /**
+     * Returns the required version of the underlying GPGME lib.
+     * 
+     * @return required library version as String (like "1.1.1")
+     */
+    public String getRequiredVersion() {
+        return _reqversion;
+    }
+
+    /**
+     * Returns the used protocol of the crypto backend.
+     * 
+     * @return protocol
+     */
+    public int getProtocol() {
+        return _protocol;
+    }
+
+    /**
+     * Tells you, is the gpg engine uses ASCII armor. Please check GPG/GPGME for
+     * documentation if you don't know what this means. (Try 'man gpg' on the
+     * command line and look for 'armor')
+     * 
+     * @return boolean true if results will be ASCII armored, if false binary
+     */
+    public boolean isArmor() {
+        return gpgmeGetArmor(getInternalRepresentation());
+    }
+
+    /**
+     * Tell the gpg engine to use ASCII armor. Please check GPG/GPGME for
+     * documentation if you don't know what this means. (Try 'man gpg' on the
+     * command line and look for 'armor')
+     * 
+     * @param state set true if results should be ASCII armored, set false if
+     *            binary
+     */
+    public void setArmor(boolean state) {
+        gpgmeSetArmor(getInternalRepresentation(), state);
+    }
+
+    /**
+     * Tells you, is the gpg engine is in text mode. Please check GPG/GPGME for
+     * documentation if you don't know what this means.
+     * 
+     * @return boolean true means text mode is on
+     */
+    public boolean isTextmode() {
+        return gpgmeGetTextmode(getInternalRepresentation());
+    }
+
+    /**
+     * Get the current text mode from the gpg engine. Please check GPG/GPGME for
+     * documentation if you don't know what this means.
+     * 
+     * @return boolean if textmode is currently enabled
+     */
+    public boolean getTextmode() {
+        return gpgmeGetTextmode(getInternalRepresentation());
+    }
+
+    /**
+     * Tell the gpg engine to set the text mode. Please check GPG/GPGME for
+     * documentation if you don't know what this means.
+     * 
+     * @param state set true if you want text mode switched on
+     */
+    public void setTextmode(boolean state) {
+        gpgmeSetTextmode(getInternalRepresentation(), state);
+    }
+
+    private long[] getInternalRepresentationFromRecipients(GnuPGKey[] recipients) {
+        // note that these are pointers to addresses in the gnupg-for-java
+        // shared lib
+        long recipientsInternals[] = new long[recipients.length];
+        for (int i = 0; i < recipients.length; i++) {
+            if (recipients[i] != null)
+                recipientsInternals[i] = recipients[i].getInternalRepresentation();
+            else
+                ; // FIXME: throw exception here? Just skip over it for now.
+        }
+        return recipientsInternals;
+    }
+
+    private boolean hasNoRecipients(GnuPGKey[] recipients) {
+        return !(recipients != null && recipients.length > 0);
+    }
+
+    /**
+     * Gets the public key with the supplied fingerprint from the keyring. This
+     * is also kind of a factory method to generate key objects, because you
+     * always need a context to access the keys in your keyring.
+     * 
+     * @param fingerprint 16 char hex fingerprint of key in your keyring
+     * @return GnuPGKey the public key that matches the fingerprint
+     * @see com.freiheit.gnupg.GnuPGKey
+     */
+    public GnuPGKey getKeyByFingerprint(String fingerprint) throws GnuPGException {
+        if (fingerprint == null || fingerprint.length() < 1) {
+            return null;
+        } else {
+            return new GnuPGKey(this, fingerprint, false);
+        }
+    }
+
+    /**
+     * Gets the secret key with the supplied fingerprint from the keyring. This
+     * is also kind of a factory method to generate secret key objects, because
+     * you always need a context to access the keys in your keyring.
+     * 
+     * @param fingerprint 16 char hex fingerprint of key in your keyring
+     * @return GnuPGKey the secret key that matches the fingerprint
+     * @see com.freiheit.gnupg.GnuPGKey
+     */
+    public GnuPGKey getSecretKeyByFingerprint(String fingerprint)
+            throws GnuPGException {
+        if (fingerprint == null || fingerprint.length() < 1) {
+            return null;
+        } else {
+            return new GnuPGKey(this, fingerprint, true);
+        }
+    }
+
+    /**
+     * Factory method to generate a GnuPGData instance from a File.
+     * 
+     * @param f should not be null or a directory and must be readable
+     * @return GnuPGData instance with data from <code>f</code>, unless
+     *         <code>f</code> is has no readable data in it, then it returns
+     *         null
+     * @throws IOException
+     * @see com.freiheit.gnupg.GnuPGData
+     */
+    public GnuPGData createDataObject(File f) throws GnuPGException, IOException {
+        if (f != null && f.exists() && !f.isDirectory() && f.canRead()) {
+            return new GnuPGData(f);
+        }
+        return null;
+    }
+
+    /**
+     * Factory method to generate a GnuPGData instance from a String.
+     * 
+     * @param data should not be null and should have a length > 0
+     * @return GnuPGData instance based on <code>data</code>, unless
+     *         <code>data</code> is null or has a length of 0, then it returns
+     *         null
+     * @see com.freiheit.gnupg.GnuPGData
+     */
+    public GnuPGData createDataObject(String data) throws GnuPGException {
+        if (data == null || data.length() < 1) {
+            return null;
+        }
+        else {
+            return new GnuPGData(data);
+        }
+    }
+
+    /**
+     * Factory method to generate a GnuPGData instance from a byte array.
+     * 
+     * @param data should not be null and should have a length > 0
+     * @return GnuPGData instance based on <code>data</code>, unless
+     *         <code>data</code> is null or has a length of 0, then it returns
+     *         null
+     * @see com.freiheit.gnupg.GnuPGData
+     */
+    public GnuPGData createDataObject(byte[] data) throws GnuPGException {
+        if (data == null || data.length < 1) {
+            return null;
+        }
+        else {
+            return new GnuPGData(data);
+        }
+    }
+
+    /**
+     * Factory method to generate an empty GnuPGData instance.
+     * 
+     * @return an empty GnuPGData instance
+     * @see com.freiheit.gnupg.GnuPGData
+     */
+    public GnuPGData createDataObject() throws GnuPGException {
+        return new GnuPGData();
+    }
+
+    /**
+     * Convenience method to generate empty key arrays. To encrypt data, you
+     * need to supply a list of recipients in an array. This is a little helper.
+     * It will not search for keys! Its just an empty array.
+     * 
+     * @param withLengthOf length of the array to generate (number of
+     *            recipients)
+     * @return GnuPGKey empty array of keys
+     * @see com.freiheit.gnupg.GnuPGKey
+     */
+    public GnuPGKey[] generateEmptyKeyArray(int withLengthOf) {
+        if (withLengthOf < 1) {
+            return null;
+        }
+        else {
+            return new GnuPGKey[withLengthOf];
+        }
+    }
+
+    /**
+     * List all public keys in keyring.
+     * 
+     * @return GnuPGKey array of key objects with all public keys
+     * @see com.freiheit.gnupg.GnuPGKey
+     */
+    public GnuPGKey[] listKeys() throws GnuPGException {
+        return searchKeys("");
+    }
+
+    /**
+     * List all secret keys in keyring.
+     * 
+     * @return GnuPGKey array of key objects with all secret keys
+     * @see com.freiheit.gnupg.GnuPGKey
+     */
+    public GnuPGKey[] listSecretKeys() throws GnuPGException {
+        return searchSecretKeys("");
+    }
+
+    /**
+     * Find all public keys matching <em>query</em> in keyring.
+     * 
+     * @param query allows the same expressions as gpg on command line
+     * @return GnuPGKey array of key objects with all matching keys
+     * @see com.freiheit.gnupg.GnuPGKey
+     */
+    public GnuPGKey[] searchKeys(String query) throws GnuPGException {
+        if (query == null) {
+            query = new String("");
+        }
+        return gpgmeKeylist(getInternalRepresentation(), query, false);
+    }
+
+    /**
+     * Find all keys matching <em>query</em> in keyring.
+     * 
+     * @param query allows the same expressions as gpg on command line
+     * @return GnuPGKey array of key objects with all matching keys
+     * @see com.freiheit.gnupg.GnuPGKey
+     */
+    public GnuPGKey[] searchSecretKeys(String query) throws GnuPGException {
+        if (query == null) {
+            query = new String("");
+        }
+        return gpgmeKeylist(getInternalRepresentation(), query, true);
+    }
+
+    /**
+     * Encrypt plain text and return ASCII-armored text.
+     * 
+     * @param recipients array of keys to encrypt to
+     * @param plain the plain text to be encrypted
+     * @return String encrypted data in ASCII-armored text
+     */
+    public String encryptToAscii(GnuPGKey[] recipients, String plain) {
+        final GnuPGData plainData = createDataObject(plain);
+        final String ret = encryptToAscii(recipients, plainData);
+        plainData.destroy();
+        return ret;
+    }
+
+    /**
+     * Encrypt a byte array and return ASCII-armored text.
+     * 
+     * @param recipients array of keys to encrypt to
+     * @param plain the byte[] to be encrypted
+     * @return String encrypted data in ASCII-armored text
+     */
+    public String encryptToAscii(GnuPGKey[] recipients, byte[] plain) {
+        final GnuPGData plainData = createDataObject(plain);
+        final String ret = encryptToAscii(recipients, plainData);
+        plainData.destroy();
+        return ret;
+    }
+
+    /**
+     * Encrypt plain text and return ASCII-armored text.
+     * 
+     * @param recipients array of keys to encrypt to
+     * @param plain the GnuPGData to be encrypted
+     * @return String encrypted data in ASCII-armored text
+     */
+    public String encryptToAscii(GnuPGKey[] recipients, GnuPGData plain) {
+        long l = getInternalRepresentation();
+        boolean previous = gpgmeGetArmor(l);
+        gpgmeSetArmor(l, true);
+        GnuPGData cipher = createDataObject();
+        encrypt(recipients, plain, cipher);
+        final String ret = cipher.toString();
+        cipher.destroy();
+        if (previous == false) // maintain the original ASCII-Armor state
+            gpgmeSetArmor(l, false);
+        return ret;
+    }
+
+    /**
+     * Encrypt a byte array and return encrypted data in binary form.
+     * 
+     * @param recipients array of keys to encrypt to
+     * @param plain the plain binary data to be encrypted
+     * @return byte[] encrypted data in binary data
+     */
+    public byte[] encryptToBinary(GnuPGKey[] recipients, byte[] plain) {
+        final GnuPGData plainData = createDataObject(plain);
+        final byte[] ret = encryptToBinary(recipients, plainData);
+        plainData.destroy();
+        return ret;
+    }
+
+    /**
+     * Encrypt plain text and return encrypted data in binary form.
+     * 
+     * @param recipients array of keys to encrypt to
+     * @param plain the plain text to be encrypted
+     * @return byte[] encrypted data in binary data
+     */
+    public byte[] encryptToBinary(GnuPGKey[] recipients, String plain) {
+        final GnuPGData plainData = createDataObject(plain);
+        final byte[] ret = encryptToBinary(recipients, plainData);
+        plainData.destroy();
+        return ret;
+    }
+
+    /**
+     * Encrypt plain data and return encrypted data in binary form.
+     * 
+     * @param recipients array of keys to encrypt to
+     * @param plain the GnuPGData to be encrypted
+     * @return String encrypted data in ASCII-armored text
+     */
+    public byte[] encryptToBinary(GnuPGKey[] recipients, GnuPGData plain) {
+        long l = getInternalRepresentation();
+        boolean previous = gpgmeGetArmor(l);
+        gpgmeSetArmor(l, true);
+        GnuPGData cipher = createDataObject();
+        encrypt(recipients, plain, cipher);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(plain.size());
+        BufferedOutputStream out = new BufferedOutputStream(baos, 8192);
+        try {
+            cipher.write(out);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        cipher.destroy();
+        if (previous == false) // maintain the original ASCII-Armor state
+            gpgmeSetArmor(l, false);
+        return baos.toByteArray();
+    }
+
+    /**
+     * Encrypts the text in <em>plain</em> with the public key of each
+     * recipient. The result is returned as GnuPGData.
+     * 
+     * @param recipients array of the keys to encrypt to
+     * @param plain bytes to be encrypted
+     * @return GnuPGData the encrypted data
+     * @see com.freiheit.gnupg.GnuPGData
+     * @see com.freiheit.gnupg.GnuPGKey
+     */
+    public GnuPGData encrypt(GnuPGKey[] recipients, byte[] plain)
+            throws GnuPGException {
+        if (hasNoRecipients(recipients) || plain == null || plain.length == 0)
+            throw new GnuPGException("Encryption arguments not complete.");
+
+        final GnuPGData plainData = createDataObject(plain);
+        GnuPGData cipherData = createDataObject();
+
+        gpgmeOpEncrypt(this.getInternalRepresentation(),
+                getInternalRepresentationFromRecipients(recipients),
+                plainData.getInternalRepresentation(),
+                cipherData.getInternalRepresentation());
+        plainData.destroy();
+        return cipherData;
+    }
+
+    /**
+     * Encrypts the text in <em>plain</em> with the public key of each
+     * recipient. The result is returned as GnuPGData.
+     * 
+     * @param recipients array of the keys to encrypt to
+     * @param plain the text to be encrypted
+     * @return GnuPGData the encrypted data
+     * @see com.freiheit.gnupg.GnuPGData
+     * @see com.freiheit.gnupg.GnuPGKey
+     */
+    public GnuPGData encrypt(GnuPGKey[] recipients, String plain)
+            throws GnuPGException {
+        if (hasNoRecipients(recipients) || plain == null || plain.equals(""))
+            throw new GnuPGException("Encryption arguments not complete.");
+
+        final GnuPGData plainData = createDataObject(plain);
+        GnuPGData cipherData = createDataObject();
+
+        gpgmeOpEncrypt(this.getInternalRepresentation(),
+                getInternalRepresentationFromRecipients(recipients),
+                plainData.getInternalRepresentation(),
+                cipherData.getInternalRepresentation());
+        plainData.destroy();
+        return cipherData;
+    }
+
+    /**
+     * Encrypts the data from <em>plain</em> with the public key of each
+     * recipient. The result is stored in <em>cipher</em>.
+     * 
+     * @param recipients Array with the public keys of all recipients
+     * @param plain text, that should be encrypted
+     * @param cipher text, the encrypted plain text after method call
+     * @see com.freiheit.gnupg.GnuPGData
+     * @see com.freiheit.gnupg.GnuPGKey
+     */
+    public void encrypt(GnuPGKey[] recipients, GnuPGData plain, GnuPGData cipher)
+            throws GnuPGException {
+        if (hasNoRecipients(recipients) || plain == null || cipher == null)
+            throw new GnuPGException("Encryption arguments not complete.");
+
+        // note that these are pointers to addresses in the gnupg-for-java
+        // shared lib
+        long context = this.getInternalRepresentation();
+        if (gpgmeGetSignersLength(context) == 0)
+            gpgmeOpEncrypt(context,
+                    getInternalRepresentationFromRecipients(recipients),
+                    plain.getInternalRepresentation(),
+                    cipher.getInternalRepresentation());
+        else
+            gpgmeOpEncryptSign(context,
+                    getInternalRepresentationFromRecipients(recipients),
+                    plain.getInternalRepresentation(),
+                    cipher.getInternalRepresentation());
+    }
+
+    public void encryptAndSign(GnuPGKey[] recipients, GnuPGData plain, GnuPGData cipher)
+            throws GnuPGException {
+        if (hasNoRecipients(recipients) || plain == null || cipher == null)
+            throw new GnuPGException("Encryption-Arguments not complete.");
+
+        gpgmeOpEncryptSign(this.getInternalRepresentation(),
+                getInternalRepresentationFromRecipients(recipients),
+                plain.getInternalRepresentation(),
+                cipher.getInternalRepresentation());
+    }
+
+    /**
+     * Decrypts the data from <em>cipher</em> and returns the result.
+     * 
+     * @param cipher the data to be decrypted
+     * @return plain the resulting decrypted data
+     * @see com.freiheit.gnupg.GnuPGData
+     */
+    public GnuPGData decrypt(byte[] cipher) throws GnuPGException {
+        if (cipher == null || cipher.length == 0)
+            throw new GnuPGException("Encryption arguments not complete.");
+
+        GnuPGData plainData = createDataObject();
+        final GnuPGData cipherData = createDataObject(cipher);
+
+        gpgmeOpDecrypt(this.getInternalRepresentation(),
+                cipherData.getInternalRepresentation(),
+                plainData.getInternalRepresentation());
+        cipherData.destroy();
+        return plainData;
+    }
+
+    /**
+     * Decrypts the data from <em>cipher</em> and returns the result.
+     * 
+     * @param cipher the data to be decrypted
+     * @return plain the resulting decrypted data
+     * @see com.freiheit.gnupg.GnuPGData
+     */
+    public GnuPGData decrypt(String cipher) throws GnuPGException {
+        if (cipher == null || cipher.length() == 0)
+            throw new GnuPGException("Encryption arguments not complete.");
+
+        GnuPGData plainData = createDataObject();
+        final GnuPGData cipherData = createDataObject(cipher);
+
+        gpgmeOpDecrypt(this.getInternalRepresentation(),
+                cipherData.getInternalRepresentation(),
+                plainData.getInternalRepresentation());
+        cipherData.destroy();
+        return plainData;
+    }
+
+    /**
+     * Decrypts the data from <em>cipher</em> and stores the result in
+     * <em>plain</em>.
+     * 
+     * @param cipher text, holds the cipher to be decrypted
+     * @param plain text, holds the decrypted text after decryption
+     * @see com.freiheit.gnupg.GnuPGData
+     */
+    public void decrypt(GnuPGData cipher, GnuPGData plain) throws GnuPGException {
+        if (cipher == null || plain == null)
+            return;
+
+        gpgmeOpDecrypt(this.getInternalRepresentation(),
+                cipher.getInternalRepresentation(), plain.getInternalRepresentation());
+    }
+
+    /**
+     * Decrypts the data from <code>cipher</code> and stores the result in
+     * <code>plain</code>, then verifies the signature of the data. If the
+     * decryption or verification fails, it throws a <code>GnuPGException</code>
+     * .
+     * 
+     * @param cipher holds the data to be decrypted and verified
+     * @param plain holds the decrypted data after decryption
+     * @see com.freiheit.gnupg.GnuPGData
+     */
+    public void decryptVerify(GnuPGData cipher, GnuPGData plain) throws GnuPGException {
+        if (cipher == null || plain == null)
+            return;
+
+        gpgmeOpDecryptVerify(this.getInternalRepresentation(),
+                cipher.getInternalRepresentation(),
+                plain.getInternalRepresentation());
+    }
+
+    public void changePassphrase(GnuPGKey key) throws GnuPGException {
+        if (key == null)
+            return;
+
+        gpgmeOpChangePassphrase(this.getInternalRepresentation(), key.getInternalRepresentation());
+
+    }
+
+    /*
+     * Not finished. Decrypts the data in <em>cipher</em> and verfies the
+     * signature on the <em>cipher</em>.
+     * @param cipher encrypted and signed data
+     * @param plain will contain the result after the method call
+     */
+    // public void decryptAndVerify(GnuPGData cipher, GnuPGData plain) throws
+    // GnuPGException{
+    // if (cipher == null || plain == null) return;
+
+    // gpgmeOpDecryptVerify(this.getInternalRepresentation(),
+    // cipher.getInternalRepresentation(), plain.getInternalRepresentation());
+    // }
+
+    /**
+     * Signs the data in <em>plain</em> and stores the result in
+     * <em>signature</em>.
+     * 
+     * @param plain data that you want to sign
+     * @param signature result of the operation
+     */
+    public void sign(GnuPGData plain, GnuPGData signature) throws GnuPGException {
+        if (plain == null || signature == null)
+            throw new GnuPGException("Parameters not complete or null.");
+
+        gpgmeOpSign(this.getInternalRepresentation(),
+                plain.getInternalRepresentation(), signature.getInternalRepresentation());
+    }
+
+    /**
+     * Verifies a signature.
+     * 
+     * @param signature TODO
+     * @param signed TODO
+     * @param plain TODO
+     */
+    public void verify(GnuPGData signature, GnuPGData signed, GnuPGData plain)
+            throws GnuPGException {
+        if (signature == null || signed == null || plain == null)
+            throw new GnuPGException("Parameters not complete or null.");
+        gpgmeOpVerify(this.getInternalRepresentation(),
+                signature.getInternalRepresentation(),
+                signed.getInternalRepresentation(),
+                plain.getInternalRepresentation());
+    }
+
+    /**
+     * Adds a Signer to this context. All signature operation will uses
+     * this/these signer(s), until you clear the signers from the context. You
+     * remove all signers at once with a call to clearSigners().
+     * 
+     * @param key that should be used for signing operations
+     * @see com.freiheit.gnupg.GnuPGKey
+     */
+    public void addSigner(GnuPGKey key) throws GnuPGException {
+        if (key == null)
+            throw new GnuPGException("Parameters not complete or null.");
+        gpgmeAddSigners(getInternalRepresentation(), key.getInternalRepresentation());
+    }
+
+    /**
+     * Removes all signers from this context. You add Signers with addSigner().
+     */
+    public void clearSigners() throws GnuPGException {
+        gpgmeClearSigners(getInternalRepresentation());
+    }
+
+    /**
+     * Get a specific Signer at a given index. You add Signers with addSigner().
+     * 
+     * @param index which signer in the list of Signers
+     * @return the GnuPGKey at index, or null if it doesn't exist
+     * @see com.freiheit.gnupg.GnuPGKey
+     */
+    public GnuPGKey getSigner(int index) throws GnuPGException {
+        return new GnuPGKey(gpgmeGetSigner(getInternalRepresentation(), index));
+    }
+
+    /**
+     * Gets the number of Signers currently in the GnuPGContext. You add Signers
+     * with addSigner().
+     * 
+     * @return long the number of Signers currently in the GnuPGContext
+     * @see com.freiheit.gnupg.GnuPGKey
+     */
+    public long getSignersLength() throws GnuPGException {
+        return gpgmeGetSignersLength(getInternalRepresentation());
+    }
+
+    /**
+     * Imports a Key (private or public). You can supply the key in ASCII armor.
+     */
+    public void importKey(GnuPGData keydata) throws GnuPGException {
+        gpgmeOpImport(getInternalRepresentation(), keydata.getInternalRepresentation());
+    }
+
+    /**
+     * Imports a Key (private or public). You can supply the key in ASCII armor.
+     */
+    public void importKey(File file) throws GnuPGException, IOException {
+        GnuPGData keydata = createDataObject(file);
+        if (keydata == null) {
+            System.out.println("importkey: parsing key data failed");
+            return;
+        }
+        gpgmeOpImport(getInternalRepresentation(), keydata.getInternalRepresentation());
+    }
+
+    /**
+     * This calls immediately the release method for the context in the
+     * underlying gpgme library. This method is called by the finalizer of the
+     * class anyway, but you can call it yourself if you want to get rid of a
+     * context at once and don't want to wait for the non-deterministic
+     * garbage-collector of the JVM.
+     */
+    public void destroy() {
+        if (getInternalRepresentation() != 0) {
+            gpgmeRelease(getInternalRepresentation());
+            setInternalRepresentation(0);
+        }
+    }
+
+    /**
+     * Releases underlying datastructures. Simple calls the destroy() method.
+     */
+    @Override
+    protected void finalize() {
+        destroy();
+    }
+
+    /**
+     * Generates a new PGP key and stores it in the keyring.
+     */
+    public void genPgpKey(String params) throws GnuPGException {
+        gpgmeOpGenKey(getInternalRepresentation(), params);
+    }
+
+    /**
+     * Generates a new Key.
+     */
+    public void genKey(String params, GnuPGData pub, GnuPGData secret) throws GnuPGException {
+        gpgmeOpGenKey(getInternalRepresentation(), params);
+    }
+
+    /**
+     * Sets the engine info for the context
+     */
+    public void setEngineInfo(int proto, String fileName, String homeDir) {
+
+        // note that this is a pointer to and address in the gnupg-for-java
+        // shared
+        // lib
+        long ctx = getInternalRepresentation();
+        gpgmeCtxSetEngineInfo(ctx, proto, fileName, homeDir);
+    }
+
+    /**
+     * Returns the result of a key generation. This must bedirectly called,
+     * after the key has been generated.
+     * 
+     * @return the result of a key generation
+     */
+    public GnuPGGenkeyResult getGenkeyResult() {
+        return gpgmeOpGenkeyResult(getInternalRepresentation());
+
+    }
+
+    /**
+     * Export the keys defined by the pattern.
+     * 
+     * @param pattern pattern for the keys
+     * @param reserved not used, must be set 0. For later use revered.
+     * @param data empty data object. Will be filled with the keys.
+     */
+    public void export(String pattern, long reserved, GnuPGData data) {
+        gpgmeOpExport(getInternalRepresentation(), pattern, 0, data.getInternalRepresentation());
+    }
+
+    /**
+     * Deletes a Key from key ring. When allowSecret, a secret Key will be
+     * deleted
+     * 
+     * @param key key to delete
+     * @param allowSecret if a secret key shall be deleted.
+     */
+    public void delete(GnuPGKey key, boolean allowSecret) {
+        gpgmeOpDelete(getInternalRepresentation(), key.getInternalRepresentation(), allowSecret);
+    }
+
+    /*
+     * Native methods: All these methods are implemented as JNI calls in:
+     * GnuPGContext.c The naming is as close as possible to the corresponding
+     * GPGME methods. So, if you want to know what these methods are actually
+     * doing: Please refer to the GPGME docs.
+     */
+    private native void gpgmeGetEngineInfo();
+
+    private native long gpgmeNew();
+
+    private native void gpgmeOpEncrypt(long l, long[] recipientsInternals, long m, long n);
+
+    private native void gpgmeOpDecrypt(long l, long m, long n);
+
+    private native void gpgmeOpChangePassphrase(long l, long m);
+
+    private native void gpgmeRelease(long l);
+
+    private native void gpgmeOpEncryptSign(long context, long[] recipients, long plain, long cipher);
+
+    private native void gpgmeOpDecryptVerify(long context, long cipher, long plain);
+
+    private native void gpgmeOpSign(long context, long l, long m);
+
+    private native void gpgmeOpVerify(long context, long l, long m, long n);
+
+    private native GnuPGKey[] gpgmeKeylist(long l, String query, boolean secret_only);
+
+    private native void gpgmeAddSigners(long l, long m);
+
+    private native void gpgmeClearSigners(long context);
+
+    private native long gpgmeGetSigner(long context, int index);
+
+    private native long gpgmeGetSignersLength(long context);
+
+    private native void gpgmeOpImport(long context, long l);
+
+    private native void gpgmeOpExport(long context, String pattern, long reserved, long l);
+
+    private native void gpgmeOpGenKey(long context, String params);
+
+    private native void gpgmeCtxSetEngineInfo(long context, int proto, String fileName,
+            String homeDir);
+
+    private native GnuPGGenkeyResult gpgmeOpGenkeyResult(long context);
+
+    private native void gpgmeOpDelete(long context, long l, boolean allowSecret);
+
+    // getters/setters for members, no caching, always direct access to gpgme
+    private native boolean gpgmeGetArmor(long l);
+
+    private native void gpgmeSetArmor(long l, boolean state);
+
+    private native boolean gpgmeGetTextmode(long l);
+
+    private native void gpgmeSetTextmode(long l, boolean state);
+
+}
+
+/* Local Variables: tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil; End: */
diff --git a/src/com/freiheit/gnupg/GnuPGData.java b/src/com/freiheit/gnupg/GnuPGData.java
new file mode 100644
index 0000000..c85ddfd
--- /dev/null
+++ b/src/com/freiheit/gnupg/GnuPGData.java
@@ -0,0 +1,173 @@
+/*
+ * $Id: GnuPGData.java,v 1.1 2005/01/24 13:56:58 stefan Exp $
+ * (c) Copyright 2005 freiheit.com technologies gmbh, Germany.
+ *
+ * This file is part of Java for GnuPG  (http://www.freiheit.com).
+ *
+ * Java for GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * Please see COPYING for the complete licence.
+ */
+
+package com.freiheit.gnupg;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Holds the data that you want to work on and stores the results of crypto
+ * operations.
+ * 
+ * @author Stefan Richter, stefan@freiheit.com
+ */
+public class GnuPGData extends GnuPGPeer {
+
+    /**
+     * Use the factory methods from GnuPGContext to create GnuPGData instances.
+     * Generates an empty data object. Use this, if you want to create a data
+     * object to hold a result from a crypto operation.
+     */
+    protected GnuPGData() {
+        setInternalRepresentation(gpgmeDataNew());
+    }
+
+    /**
+     * Use the factory methods in GnuPGContext to create GnuPGData instances.
+     * Generates a new data object based on read/write stream access to a file.
+     * 
+     * @param file your file
+     * @throws IOException
+     */
+    protected GnuPGData(File file) throws IOException, GnuPGException {
+        this(file, "r+");
+    }
+
+    /**
+     * Use the factory methods in GnuPGContext to create GnuPGData instances.
+     * Generates a new data object based on stream access to a file, with
+     * settable open mode.
+     * 
+     * @param file your file
+     * @param mode the POSIX mode to open the file, e.g "r" or "w+"
+     * @throws IOException
+     */
+    protected GnuPGData(File file, String mode) throws IOException, GnuPGException {
+        if (file == null || !file.exists())
+            throw new FileNotFoundException();
+        if (!file.canRead())
+            throw new IOException("Cannot read: " + file);
+        if (!file.canRead())
+            throw new IOException("Is a directory: " + file);
+        setInternalRepresentation(gpgmeDataNewFromFilename(file.getCanonicalPath(), mode));
+    }
+
+    /**
+     * Use the factory methods from GnuPGContext to create GnuPGData instances.
+     * Generates a new data object containing the given String.
+     * 
+     * @param str your string
+     */
+    protected GnuPGData(String str) {
+        this(str.getBytes());
+    }
+
+    /**
+     * Use the factory methods from GnuPGContext to create GnuPGData instances.
+     * Generates a new Data-Object containing the given byte array.
+     * 
+     * @param data your data
+     */
+    protected GnuPGData(byte[] data) {
+        long gpgmeDataNewFromMem = gpgmeDataNewFromMem(data);
+        setInternalRepresentation(gpgmeDataNewFromMem);
+    }
+
+    /*
+     * FIXME: This is not working! Use it, and it will crash the JVM.
+     */
+    public void read(InputStream in) throws IOException {
+        if (in != null) {
+            gpgmeDataRead(getInternalRepresentation(), in);
+        }
+    }
+
+    /**
+     * Writes the data/string contained in this data object to the given Java
+     * OutputStream.
+     * 
+     * @param out OutputStream, where the data/string should be written
+     */
+    public void write(OutputStream out) throws IOException {
+        if (out != null) {
+            gpgmeDataWrite(getInternalRepresentation(), out);
+        }
+    }
+
+    /**
+     * Helper method to print out the data/string from this data object.
+     * 
+     * @return String representation of the data contained in this data object
+     *         (expect weird results with binary data)
+     */
+    @Override
+    public String toString() {
+        String result = null;
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(this.size());
+        try {
+            this.write(baos);
+            result = baos.toString();
+        } catch (IOException ioe) {
+            result = ioe.getMessage();
+        }
+        return result;
+    }
+
+    /**
+     * This calls immediately the release method for the datastructure in the
+     * underlying gpgme library. This method is called by the finalizer of the
+     * class anyway, but you can call it yourself if you want to get rid of this
+     * datastructure at once and don't want to wait for the non-deterministic
+     * garbage-collector of the JVM.
+     */
+    public void destroy() {
+        if (getInternalRepresentation() != 0) {
+            gpgmeDataRelease(getInternalRepresentation());
+            setInternalRepresentation(0);
+        }
+    }
+
+    /**
+     * Releases underlying datastructures. Simple calls the destroy() method.
+     */
+    @Override
+    protected void finalize() {
+        destroy();
+    }
+
+    public int size() {
+        return gpgmeSize(getInternalRepresentation());
+    }
+
+    private native int gpgmeSize(long l);
+
+    private native long gpgmeDataNewFromMem(byte[] plain);
+
+    private native long gpgmeDataNewFromFilename(String filename, String mode);
+
+    private native long gpgmeDataNew();
+
+    private native void gpgmeDataWrite(long l, OutputStream out) throws IOException;
+
+    private native void gpgmeDataRelease(long l);
+
+    private native void gpgmeDataRead(long data, InputStream in) throws IOException;
+}
+
+/* Local Variables: tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil; End: */
diff --git a/src/java/com/freiheit/gnupg/GnuPGException.java b/src/com/freiheit/gnupg/GnuPGException.java
similarity index 59%
rename from src/java/com/freiheit/gnupg/GnuPGException.java
rename to src/com/freiheit/gnupg/GnuPGException.java
index 3f3a60f..1884e7b 100644
--- a/src/java/com/freiheit/gnupg/GnuPGException.java
+++ b/src/com/freiheit/gnupg/GnuPGException.java
@@ -15,29 +15,24 @@
 package com.freiheit.gnupg;
 
 /**
-   If the underlying gpgme library reports an error, this exception is thrown.
-   Wraps all errors messages from inside gpgme.
-
-   @author Stefan Richter, stefan@freiheit.com
-*/
-public class GnuPGException extends RuntimeException{    
+ * If the underlying gpgme library reports an error, this exception is thrown.
+ * Wraps all errors messages from inside gpgme.
+ * 
+ * @author Stefan Richter, stefan@freiheit.com
+ */
+public class GnuPGException extends RuntimeException {
 
     private static final long serialVersionUID = -775599686124698560L;
 
     /**
-       This Exception is normally only thrown from 
-       within the native part of this library. 
-
-       @param msg is an error message text from gpgme
+     * This Exception is normally only thrown from within the native part of
+     * this library.
+     * 
+     * @param msg is an error message text from gpgme
      */
     GnuPGException(String msg) {
         super(msg);
     }
 }
-/*
- * Local variables:
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * compile-command: "ant -emacs -find build.xml"
- * End:
- */
+
+/* Local Variables: tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil; End: */
diff --git a/src/java/com/freiheit/gnupg/GnuPGGenkeyResult.java b/src/com/freiheit/gnupg/GnuPGGenkeyResult.java
similarity index 62%
rename from src/java/com/freiheit/gnupg/GnuPGGenkeyResult.java
rename to src/com/freiheit/gnupg/GnuPGGenkeyResult.java
index 8deac4e..9e9b4ba 100644
--- a/src/java/com/freiheit/gnupg/GnuPGGenkeyResult.java
+++ b/src/com/freiheit/gnupg/GnuPGGenkeyResult.java
@@ -14,6 +14,7 @@
 /**
  * 
  */
+
 package com.freiheit.gnupg;
 
 /**
@@ -37,41 +38,46 @@
  * @author <a href="mailto:stefan.neumann@freiheit.com">Stefan Neumann</a>
  * @version $Id$
  */
-public class GnuPGGenkeyResult{
-	
-	private String _fpr;
-	private boolean _primary;
-	private boolean _sub;
-		
-	protected GnuPGGenkeyResult(){
-	}
-	
+public class GnuPGGenkeyResult {
+
+    private String _fpr;
+    private boolean _primary;
+    private boolean _sub;
+
+    protected GnuPGGenkeyResult() {
+    }
+
     /**
-     * This is the fingerprint of the key that was created.  If both 
-     * a primary and a sub key were generated, the fingerprint of 
-     * the primary key will be returned.  If the crypto engine does 
-     * not provide the fingerprint, `it will return a null pointer.
-     * @return fingerprint of the created key 
+     * This is the fingerprint of the key that was created. If both a primary
+     * and a sub key were generated, the fingerprint of the primary key will be
+     * returned. If the crypto engine does not provide the fingerprint, `it will
+     * return a null pointer.
+     * 
+     * @return fingerprint of the created key
      */
-    public String getFpr(){
+    public String getFpr() {
         return _fpr;
     }
 
     /**
-     * This is a flag that is set to true if a primary key was created 
-     * and to false if not.
+     * This is a flag that is set to true if a primary key was created and to
+     * false if not.
+     * 
      * @return flag, if a primary key was created
      */
-    public boolean isPrimary(){
-    	return _primary;
+    public boolean isPrimary() {
+        return _primary;
     }
-    
+
     /**
-     * This is a flag that is set to true if a subkey was created and
-     *  to false if not.
+     * This is a flag that is set to true if a subkey was created and to false
+     * if not.
+     * 
      * @return flag, if a subkey was created
      */
-    public boolean isSub(){
-    	return _sub;
+    public boolean isSub() {
+        return _sub;
     }
 }
+
+/* Local Variables: tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil; End: */
diff --git a/src/com/freiheit/gnupg/GnuPGKey.java b/src/com/freiheit/gnupg/GnuPGKey.java
new file mode 100644
index 0000000..41ad351
--- /dev/null
+++ b/src/com/freiheit/gnupg/GnuPGKey.java
@@ -0,0 +1,306 @@
+/*
+ * $Id: GnuPGKey.java,v 1.1 2005/01/24 13:56:58 stefan Exp $
+ * (c) Copyright 2005 freiheit.com technologies gmbh, Germany.
+ *
+ * This file is part of Java for GnuPG  (http://www.freiheit.com).
+ *
+ * Java for GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * Please see COPYING for the complete licence.
+ */
+
+package com.freiheit.gnupg;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Represents a key. You can manage and find keys using GnuPGContext. You can
+ * not instantiate a key by yourself. You always need a context.
+ *
+ * @see com.freiheit.gnupg.GnuPGContext
+ * @author Stefan Richter, stefan@freiheit.com
+ */
+public class GnuPGKey extends GnuPGPeer {
+    /**
+     * This constructor is only called from within the JNI routines. This is for
+     * example used, when a keylist search returns keys. This is how then each
+     * key is instantiated on the java side from c.
+     */
+    protected GnuPGKey(long ptr) {
+        // note that this is a pointer to an address in the gnupg-for-java shared lib
+        setInternalRepresentation(ptr);
+    }
+
+    /**
+     * Fetch a public key by its 16 hex char fingerprint String
+     *
+     * @param context - the current GnuPGContext
+     * @param fingerprint - the 16 hex char fingerprint String
+     */
+    protected GnuPGKey(GnuPGContext context, String fingerprint) {
+        setInternalRepresentation(gpgmeGetKey(context.getInternalRepresentation(), fingerprint,
+                false));
+    }
+
+    /**
+     * Fetch a key by its 16 hex char fingerprint String
+     *
+     * @param context the current GnuPGContext
+     * @param fingerprint the 16 hex char fingerprint String
+     * @param secret_only whether to return only secret keys
+     */
+    protected GnuPGKey(GnuPGContext context, String fingerprint, boolean secret_only) {
+        setInternalRepresentation(gpgmeGetKey(context.getInternalRepresentation(), fingerprint,
+                secret_only));
+    }
+
+    /**
+     * Get the Name of the default key/userid.
+     */
+    public String getName() {
+        return gpgmeGetName(getInternalRepresentation());
+    }
+
+    /**
+     * Get the Email-Address of the default key/userid.
+     */
+    public String getEmail() {
+        return gpgmeGetEmail(getInternalRepresentation());
+    }
+
+    /**
+     * Get the Key-ID of the default key/userid.
+     */
+    public String getKeyID() {
+        return gpgmeGetKeyID(getInternalRepresentation());
+    }
+
+    public Date getTimestamp() {
+        return new Date(gpgmeGetTimestamp(getInternalRepresentation()) / 1000);
+    }
+
+    /**
+     * Get the Fingerprint of the default key/userid.
+     */
+    public String getFingerprint() {
+        return gpgmeGetFingerprint(getInternalRepresentation());
+    }
+
+    /**
+     * Get the Comment of the default key/userid.
+     */
+    public String getComment() {
+        return gpgmeGetComment(getInternalRepresentation());
+    }
+
+    /**
+     * Get the User-ID of the default key/userid.
+     */
+    public String getUserID() {
+        return gpgmeGetUserID(getInternalRepresentation());
+    }
+
+    public boolean canEncrypt() {
+        return gpgmeCanEncrypt(getInternalRepresentation());
+    }
+
+    public boolean canSign() {
+        return gpgmeCanSign(getInternalRepresentation());
+    }
+
+    public boolean canCertify() {
+        return gpgmeCanCertify(getInternalRepresentation());
+    }
+
+    public boolean canAuthenticate() {
+        return gpgmeCanAuthenticate(getInternalRepresentation());
+    }
+
+    public boolean isRevoked() {
+        return gpgmeIsRevoked(getInternalRepresentation());
+    }
+
+    public boolean isExpired() {
+        return gpgmeIsExpired(getInternalRepresentation());
+    }
+
+    public boolean isDisabled() {
+        return gpgmeIsDisabled(getInternalRepresentation());
+    }
+
+    public boolean isInvalid() {
+        return gpgmeIsInvalid(getInternalRepresentation());
+    }
+
+    public boolean isQualified() {
+        return gpgmeIsQualified(getInternalRepresentation());
+    }
+
+    public boolean isSecret() {
+        return gpgmeIsSecret(getInternalRepresentation());
+    }
+
+    public boolean hasSecretKey() {
+        return gpgmeHasSecretKey(getInternalRepresentation());
+    }
+
+    /**
+     * Lists all signatures of the default key/userid. Every key can have
+     * multiple signatures. Signatures can be incomplete. This means, that not
+     * all details (name, email-address etc.) were downloaded from a keyserver.
+     * But you will at least see the key-id of the signature. Use GnuPG to
+     * --refresh-keys if you want to see all signature details.
+     * <p>
+     * Currently I am not supporting java generics for a type safe iterator,
+     * because there are to many people still using jdk-1.4.x without generics
+     * support. This will be changed on increasing demand.
+     * <p>
+     *
+     * @return Iterator of GnuPGSignature objects
+     * @see com.freiheit.gnupg.GnuPGSignature
+     */
+    public Iterator<GnuPGSignature> getSignatures() {
+        List<GnuPGSignature> siglist = null;
+        GnuPGSignature sig = getSignature();
+        while (sig != null) {
+            if (siglist == null) {
+                siglist = new ArrayList<GnuPGSignature>();
+            }
+            siglist.add(sig);
+            sig = sig.getNextSignature();
+        }
+        if (siglist == null)
+            return null;
+        else
+            return siglist.listIterator();
+    }
+
+    /**
+     * Helper to list signatures in the toString()-method.
+     */
+    private String listSignatures() {
+        Iterator<GnuPGSignature> iter = getSignatures();
+        GnuPGSignature sig;
+        StringBuffer buf = new StringBuffer();
+
+        while (iter != null && iter.hasNext()) {
+            sig = iter.next();
+            buf.append("\t").append(sig).append("\n");
+        }
+
+        return buf.toString();
+    }
+
+    /**
+     * Helper to get the head of the linked list of signatures from the native
+     * space.
+     */
+    private GnuPGSignature getSignature() {
+        GnuPGSignature result = null;
+
+        // note that thhis is a pointer to an address in the gnupg-for-java shared
+        // lib
+        long ptr = gpgmeGetSignature(getInternalRepresentation());
+
+        if (ptr != 0) {
+            result = new GnuPGSignature(ptr);
+        }
+
+        return result;
+    }
+
+    /**
+     * Return this key with all of its signatures.
+     *
+     * @return String multiline text with one key and 0..many signatures
+     */
+    public String toString() {
+        StringBuffer buf = new StringBuffer();
+        buf.append(getKeyID()).
+                append(": ").
+                append(getName()).
+                append(", ").
+                append(getComment()).
+                append(", ").
+                append(getEmail()).
+                append(", ").
+                append("[").
+                append(getFingerprint()).
+                append("]").
+                append("\n").
+                append(listSignatures());
+        return buf.toString();
+    }
+
+    /**
+     * This calls immediately the release method for the datastructure in the
+     * underlying gpgme library. This method is called by the finalizer of the
+     * class anyway, but you can call it yourself if you want to get rid of this
+     * datastructure at once and don't want to wait for the non-deterministic
+     * garbage-collector of the JVM.
+     */
+    public void destroy() {
+        if (getInternalRepresentation() != 0) {
+            gpgmeKeyUnref(getInternalRepresentation());
+            setInternalRepresentation(0);
+        }
+    }
+
+    /**
+     * Releases underlying datastructures. Simple calls the destroy() method.
+     */
+    protected void finalize() {
+        destroy();
+    }
+
+    private native long gpgmeGetKey(long context, String fingerprint, boolean secret);
+
+    private native long gpgmeKeyUnref(long keyptr);
+
+    private native String gpgmeGetName(long keyptr);
+
+    private native String gpgmeGetEmail(long keyptr);
+
+    private native String gpgmeGetKeyID(long keyptr);
+
+    private native long gpgmeGetTimestamp(long keyptr);
+
+    private native String gpgmeGetFingerprint(long keyptr);
+
+    private native String gpgmeGetComment(long keyptr);
+
+    private native String gpgmeGetUserID(long keyptr);
+
+    private native long gpgmeGetSignature(long keyptr);
+
+    private native boolean gpgmeCanEncrypt(long keyptr);
+
+    private native boolean gpgmeCanSign(long keyptr);
+
+    private native boolean gpgmeCanCertify(long keyptr);
+
+    private native boolean gpgmeCanAuthenticate(long keyptr);
+
+    private native boolean gpgmeIsRevoked(long keyptr);
+
+    private native boolean gpgmeIsExpired(long keyptr);
+
+    private native boolean gpgmeIsDisabled(long keyptr);
+
+    private native boolean gpgmeIsInvalid(long keyptr);
+
+    private native boolean gpgmeIsQualified(long keyptr);
+
+    private native boolean gpgmeIsSecret(long keyptr);
+
+    private native boolean gpgmeHasSecretKey(long keyptr);
+
+}
+
+/* Local Variables: tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil; End: */
diff --git a/src/com/freiheit/gnupg/GnuPGPeer.java b/src/com/freiheit/gnupg/GnuPGPeer.java
new file mode 100644
index 0000000..136e3e8
--- /dev/null
+++ b/src/com/freiheit/gnupg/GnuPGPeer.java
@@ -0,0 +1,45 @@
+/*
+ * $Id: GnuPGPeer.java,v 1.1 2005/01/24 13:56:58 stefan Exp $
+ * (c) Copyright 2005 freiheit.com technologies gmbh, Germany.
+ *
+ * This file is part of Java for GnuPG  (http://www.freiheit.com).
+ *
+ * Java for GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * Please see COPYING for the complete licence.
+ */
+
+package com.freiheit.gnupg;
+
+/**
+ * Peer Class to hold the pointers to connect to the underlying gpgme library.
+ * This is the base class for all GnuPG*.java Classes. DO NOT USE IT. It is not
+ * intended for library users.
+ * 
+ * @author Stefan Richter, stefan@freiheit.com
+ */
+public class GnuPGPeer {
+    // note that this is a pointer to an address in the gnupg-for-java shared lib
+    protected long _internalRepresentation;
+
+    /**
+     * DO NOT USE IT. This is only use from inside the library.
+     */
+    protected void setInternalRepresentation(long ptr) {
+        // note that this is a pointer to an address in the gnupg-for-java shared lib
+        _internalRepresentation = ptr;
+    }
+
+    /**
+     * DO NOT USE IT. This is only use from inside the library.
+     */
+    protected long getInternalRepresentation() {
+        // note that this is a pointer to an address in the gnupg-for-java shared lib
+        return _internalRepresentation;
+    }
+}
+
+/* Local Variables: tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil; End: */
diff --git a/src/com/freiheit/gnupg/GnuPGSignature.java b/src/com/freiheit/gnupg/GnuPGSignature.java
new file mode 100644
index 0000000..568778d
--- /dev/null
+++ b/src/com/freiheit/gnupg/GnuPGSignature.java
@@ -0,0 +1,195 @@
+/*
+ * $Id: GnuPGSignature.java,v 1.1 2005/01/24 13:56:58 stefan Exp $
+ * (c) Copyright 2005 freiheit.com technologies gmbh, Germany.
+ *
+ * This file is part of Java for GnuPG  (http://www.freiheit.com).
+ *
+ * Java for GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * Please see COPYING for the complete licence.
+ */
+
+package com.freiheit.gnupg;
+
+/**
+ * Represents a signature from a key. A signature doesn't stand alone. It is
+ * always bound to a key. So if you want to see a signature, you first have to
+ * get a key via the GnuPGContext.
+ * <p>
+ * This class accesses directly the corresponding structure "under the hood" and
+ * stores no data in java members. This means, that every call of a method also
+ * results in a native call to access gpgme memory.
+ * 
+ * @author Stefan Richter, stefan@freiheit.com
+ * @see com.freiheit.gnupg.GnuPGContext
+ */
+public class GnuPGSignature extends GnuPGPeer {
+
+    /**
+     * This constructor is only called from GnuPGKey. It is called when the lib
+     * browses thru the linked list of signatures of each key.
+     * 
+     * @see com.freiheit.gnupg.GnuPGKey
+     */
+    protected GnuPGSignature(long ptr) {
+        // note that this is a pointer to an address in the gnupg-for-java shared lib
+        setInternalRepresentation(ptr);
+    }
+
+    /**
+     * Is signature key revoked?
+     * 
+     * @return true, if revoked
+     */
+    public boolean isRevoked() {
+        return gpgmeGetRevoked(getInternalRepresentation());
+    }
+
+    /**
+     * Is signature key expired?
+     * 
+     * @return true, if expired
+     */
+    public boolean isExpired() {
+        return gpgmeGetExpired(getInternalRepresentation());
+    }
+
+    /**
+     * Is signature key invalid?
+     * 
+     * @return true, if invalid
+     */
+    public boolean isInvalid() {
+        return gpgmeGetInvalid(getInternalRepresentation());
+    }
+
+    /**
+     * Is signature key exportable?
+     * 
+     * @return true, if exportable
+     */
+    public boolean isExportable() {
+        return gpgmeGetExportable(getInternalRepresentation());
+    }
+
+    /**
+     * Returns Key-ID of signature key.
+     * 
+     * @return Key-ID
+     */
+    public String getKeyID() {
+        return gpgmeGetKeyID(getInternalRepresentation());
+    }
+
+    /**
+     * Returns User-ID of signer.
+     * 
+     * @return User-ID
+     */
+    public String getUserID() {
+        return gpgmeGetUserID(getInternalRepresentation());
+    }
+
+    /**
+     * Returns Name of signer.
+     * 
+     * @return Name
+     */
+    public String getName() {
+        return gpgmeGetName(getInternalRepresentation());
+    }
+
+    /**
+     * Returns Email-Address of signer.
+     * 
+     * @return Email-Address
+     */
+    public String getEmail() {
+        return gpgmeGetEmail(getInternalRepresentation());
+    }
+
+    /**
+     * Returns Comment.
+     * 
+     * @return Comment
+     */
+    public String getComment() {
+        return gpgmeGetComment(getInternalRepresentation());
+    }
+
+    /**
+     * Checks, if all signature details are available.
+     * 
+     * @return true, if more info than the keyid is available
+     */
+    public boolean hasDetails() {
+        return !getName().equals("");
+    }
+
+    /**
+     * String-Representation of this Signature.
+     * 
+     * @return String single line of text with name, comment etc.
+     */
+    public String toString() {
+        StringBuffer buf = new StringBuffer();
+        buf.append(getKeyID());
+        if (hasDetails()) {
+            buf.append(", ");
+            buf.append(getName());
+            buf.append(", ");
+            buf.append(getComment());
+            buf.append(", ");
+            buf.append(getEmail());
+        }
+        else {
+            buf.append(" <No details available.>");
+        }
+        return buf.toString();
+    }
+
+    /**
+     * Gets the next pointer in the gpgme_key_sig_t structure.
+     * 
+     * @return new GnuPGSignature-Object
+     */
+    protected GnuPGSignature getNextSignature() {
+        GnuPGSignature result = null;
+
+        // note that this is a pointer to an address in the gnupg-for-java shared lib
+        long next = gpgmeGetNextSignature(getInternalRepresentation());
+
+        if (next != 0) {
+            result = new GnuPGSignature(next);
+        }
+
+        return result;
+    }
+
+    // native method declarations:
+    private native boolean gpgmeGetRevoked(long l);
+
+    private native boolean gpgmeGetExpired(long l);
+
+    private native boolean gpgmeGetInvalid(long l);
+
+    private native boolean gpgmeGetExportable(long l);
+
+    private native String gpgmeGetKeyID(long l);
+
+    private native String gpgmeGetUserID(long l);
+
+    private native String gpgmeGetName(long l);
+
+    private native String gpgmeGetEmail(long l);
+
+    private native String gpgmeGetComment(long l);
+
+    private native long gpgmeGetNextSignature(long l);
+
+}
+
+/* Local Variables: tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil; End: */
diff --git a/src/java/com/freiheit/gnupg/package.html b/src/com/freiheit/gnupg/package.html
similarity index 100%
rename from src/java/com/freiheit/gnupg/package.html
rename to src/com/freiheit/gnupg/package.html
diff --git a/src/junit/com/freiheit/gnupg/GnuPGTestSuite.java b/src/com/freiheit/gnupg/tests/GnuPGTestSuite.java
similarity index 70%
rename from src/junit/com/freiheit/gnupg/GnuPGTestSuite.java
rename to src/com/freiheit/gnupg/tests/GnuPGTestSuite.java
index afeb97d..dca4169 100644
--- a/src/junit/com/freiheit/gnupg/GnuPGTestSuite.java
+++ b/src/com/freiheit/gnupg/tests/GnuPGTestSuite.java
@@ -11,125 +11,128 @@
  *
  * Please see COPYING for the complete licence.
  */
-package com.freiheit.gnupg;
 
-import java.io.File;
+package com.freiheit.gnupg.tests;
+
 import java.util.Iterator;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-/**
-   I will improve this TestSuite later, that everybody can run it without
-   specific fingerprints. It should behave like the tests in gpgme.
-   <p>
-   But the tests can also be seen as code examples.
+import com.freiheit.gnupg.GnuPGContext;
+import com.freiheit.gnupg.GnuPGData;
+import com.freiheit.gnupg.GnuPGKey;
+import com.freiheit.gnupg.GnuPGSignature;
 
-   @author Stefan Richter, stefan@freiheit.com
+/**
+ * I will improve this TestSuite later, that everybody can run it without
+ * specific fingerprints. It should behave like the tests in gpgme.
+ * <p>
+ * But the tests can also be seen as code examples.
+ * 
+ * @author Stefan Richter, stefan@freiheit.com
  */
-public class GnuPGTestSuite extends TestCase{
+public class GnuPGTestSuite extends TestCase {
 
-    private static String HOME = "/tmp/gnupg";
+    private static String HOME = "/tmp/gnupg-for-java-tests";
     private static String PLAINTEXT = "I am a not so secret text.";
-    //Currently, you can not run these test without these fingerprints.
-    //And: You need to know the passphrases...forget it.
+    // Currently, you can not run these test without these fingerprints.
+    // And: You need to know the passphrases...forget it.
     // but you could add your own fingerprints...
     private static String CD_FPR = "1C12878CFAA2ECDC81DC43DB12262834A6123FF6";
-    //private static String SR_FPR = "F05F385DFA40962D0075AB9C2B80170D";
+    // private static String SR_FPR = "F05F385DFA40962D0075AB9C2B80170D";
     private static String SR_FPR = "BE54B261FDDF09025D249CAF948C94764B9A38DB";
 
-    //private static GnuPGKey person1 = null;
-    //private static GnuPGKey person2 = null;
-
+    // private static GnuPGKey person1 = null;
+    // private static GnuPGKey person2 = null;
 
     public static Test suite() {
         System.out.println("suite()");
-        TestSuite suite= new TestSuite(GnuPGTestSuite.class);
+        TestSuite suite = new TestSuite(GnuPGTestSuite.class);
         GnuPGContext ctx = getContext();
 
-        String person1Key = " <GnupgKeyParms format=\"internal\">\n"+
-            "Key-Type: DSA\n"+
-            "Key-Length: 1024\n"+
-            "Subkey-Type: ELG-E\n"+
-            "Subkey-Length: 1024\n"+
-            "Name-Real: alpha\n"+
-            "Name-Comment: just a test\n"+
-            "Name-Email: alpha@alpha.org\n"+
-            "Expire-Date: 0\n"+
-            "Passphrase: alpha\n"+
-            "</GnupgKeyParms>";
-        ctx.genKey(person1Key,null,null);
-        //String fpr1 = ctx.getGenkeyResult().getFpr();
-
-        String person2Key = " <GnupgKeyParms format=\"internal\">\n"+
-            "Key-Type: DSA\n"+
-            "Key-Length: 1024\n"+
-            "Subkey-Type: ELG-E\n"+
-            "Subkey-Length: 1024\n"+
-            "Name-Real: beta\n"+
-            "Name-Comment: just a test\n"+
-            "Name-Email: beta@beta.org\n"+
-            "Expire-Date: 0\n"+
-            "Passphrase: beta\n"+
-        "</GnupgKeyParms>";
-        ctx.genKey(person2Key,null,null);
-        //String fpr2 = ctx.getGenkeyResult().getFpr();
+        String person1Key = " <GnupgKeyParms format=\"internal\">\n" +
+                "Key-Type: DSA\n" +
+                "Key-Length: 1024\n" +
+                "Subkey-Type: ELG-E\n" +
+                "Subkey-Length: 1024\n" +
+                "Name-Real: alpha\n" +
+                "Name-Comment: just a test\n" +
+                "Name-Email: alpha@alpha.org\n" +
+                "Expire-Date: 0\n" +
+                "Passphrase: alpha\n" +
+                "</GnupgKeyParms>";
+        ctx.genKey(person1Key, null, null);
+        // String fpr1 = ctx.getGenkeyResult().getFpr();
+
+        String person2Key = " <GnupgKeyParms format=\"internal\">\n" +
+                "Key-Type: DSA\n" +
+                "Key-Length: 1024\n" +
+                "Subkey-Type: ELG-E\n" +
+                "Subkey-Length: 1024\n" +
+                "Name-Real: beta\n" +
+                "Name-Comment: just a test\n" +
+                "Name-Email: beta@beta.org\n" +
+                "Expire-Date: 0\n" +
+                "Passphrase: beta\n" +
+                "</GnupgKeyParms>";
+        ctx.genKey(person2Key, null, null);
+        // String fpr2 = ctx.getGenkeyResult().getFpr();
 
         System.out.println("done suite()");
         return suite;
     }
 
-    public static GnuPGContext getContext(){
+    public static GnuPGContext getContext() {
         GnuPGContext ctx = new GnuPGContext();
-        ctx.setEngineInfo(ctx.getProtocol(),ctx.getFilename(),HOME);
+        ctx.setEngineInfo(ctx.getProtocol(), ctx.getFilename(), HOME);
         return ctx;
     }
 
-    public void testEngine(){
+    public void testEngine() {
         GnuPGContext ctx = new GnuPGContext();
         ctx.getVersion();
         ctx.getFilename();
         ctx.getRequiredVersion();
     }
 
-    public void testContextSetterAndGetter(){
+    public void testContextSetterAndGetter() {
         GnuPGContext ctx = new GnuPGContext();
 
         // Test set/isArmor()
-        assertTrue(ctx.isArmor());//default: true
+        assertTrue(ctx.isArmor());// default: true
         ctx.setArmor(false);
         assertFalse(ctx.isArmor());
         ctx.setArmor(true);
         assertTrue(ctx.isArmor());
 
         // Test set/isTextmode()
-        assertTrue(ctx.isTextmode());//default: true
+        assertTrue(ctx.isTextmode());// default: true
         ctx.setTextmode(false);
         assertFalse(ctx.isTextmode());
         ctx.setTextmode(true);
         assertTrue(ctx.isTextmode());
     }
 
-    public void testKeySearch(){
+    public void testKeySearch() {
         GnuPGContext ctx = new GnuPGContext();
         GnuPGKey[] keys = ctx.searchKeys("stefan");
 
         assertNotNull(keys);
 
-        for(int i=0; keys != null && i < keys.length; i++){
+        for (int i = 0; keys != null && i < keys.length; i++) {
             assertNotNull(keys[i]);
             Iterator iter = keys[i].getSignatures();
-            System.out.println(keys[i]);//Uncomment to print each key
-            while(iter.hasNext()){
-                assertNotNull((GnuPGSignature)iter.next());
+            System.out.println(keys[i]);// Uncomment to print each key
+            while (iter.hasNext()) {
+                assertNotNull((GnuPGSignature) iter.next());
             }
         }
     }
 
-    public void testEncryptForOneRecipient(){
+    public void testEncryptForOneRecipient() {
         GnuPGContext ctx = new GnuPGContext();
-        ctx.setPassphraseListener(new GnuPGPassphraseWindow());
         GnuPGData plain = ctx.createDataObject(PLAINTEXT);
         GnuPGData cipher = ctx.createDataObject();
 
@@ -141,9 +144,8 @@ public void testEncryptForOneRecipient(){
         assertNotNull(cipher.toString());
     }
 
-    public void testEncryptForTwoRecipients(){
+    public void testEncryptForTwoRecipients() {
         GnuPGContext ctx = new GnuPGContext();
-        ctx.setPassphraseListener(new GnuPGPassphraseWindow());
         GnuPGData plain = ctx.createDataObject(PLAINTEXT);
         GnuPGData cipher = ctx.createDataObject();
 
@@ -156,9 +158,8 @@ public void testEncryptForTwoRecipients(){
         assertNotNull(cipher.toString());
     }
 
-    public void testDecryptFromOneRecipient(){
+    public void testDecryptFromOneRecipient() {
         GnuPGContext ctx = new GnuPGContext();
-        ctx.setPassphraseListener(new GnuPGPassphraseWindow());
         GnuPGData plain = ctx.createDataObject(PLAINTEXT);
         GnuPGData cipher = ctx.createDataObject();
         GnuPGData decrypted = ctx.createDataObject();
@@ -173,7 +174,7 @@ public void testDecryptFromOneRecipient(){
         assertEquals(decrypted.toString(), PLAINTEXT);
     }
 
-    public void testAddAndClearSigners(){
+    public void testAddAndClearSigners() {
         GnuPGContext ctx = new GnuPGContext();
         GnuPGKey signer1 = ctx.getKeyByFingerprint(SR_FPR);
         GnuPGKey signer2 = ctx.getKeyByFingerprint(CD_FPR);
@@ -183,9 +184,8 @@ public void testAddAndClearSigners(){
         ctx.clearSigners();
     }
 
-    public void testSign(){
+    public void testSign() {
         GnuPGContext ctx = new GnuPGContext();
-        ctx.setPassphraseListener(new GnuPGPassphraseWindow());
         GnuPGData plain = ctx.createDataObject(PLAINTEXT);
         GnuPGData signature = ctx.createDataObject();
 
@@ -201,12 +201,11 @@ public void testSign(){
 
     public void testEncrypt() {
         GnuPGContext ctx = new GnuPGContext();
-        ctx.setPassphraseListener(new GnuPGPassphraseConsole());
 
         String plaintext = "HALLLLLLLLLLO";
-        System.out.println( "plaintext: " + plaintext );
+        System.out.println("plaintext: " + plaintext);
         GnuPGData plain = ctx.createDataObject(plaintext);
-        System.out.println( "plain (from data object): \"" + plain.toString()  + "\"");
+        System.out.println("plain (from data object): \"" + plain.toString() + "\"");
         GnuPGData encrypted = ctx.createDataObject();
 
         GnuPGKey[] recipients = ctx.generateEmptyKeyArray(1);
@@ -214,11 +213,11 @@ public void testEncrypt() {
 
         ctx.encrypt(recipients, plain, encrypted);
 
-        System.out.println("encrypted (from data object: \"" + encrypted.toString()  + "\"");
+        System.out.println("encrypted (from data object: \"" + encrypted.toString() + "\"");
 
         String encStr = encrypted.toString();
 
-        assertNotNull( encStr );
+        assertNotNull(encStr);
         assertFalse("Encrypted message cannot be empty.", encStr.length() == 0);
 
     }
@@ -287,10 +286,5 @@ public void testEncrypt() {
 //    }
 
 }
-/*
- * Local variables:
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * compile-command: "ant -emacs -find build.xml"
- * End:
- */
+
+/* Local Variables: tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil; End: */
diff --git a/src/java/com/freiheit/gnupg/GnuPGContext.java b/src/java/com/freiheit/gnupg/GnuPGContext.java
deleted file mode 100644
index fc8f1c7..0000000
--- a/src/java/com/freiheit/gnupg/GnuPGContext.java
+++ /dev/null
@@ -1,653 +0,0 @@
-/*
- * $Id: GnuPGContext.java,v 1.4 2006/07/03 15:32:16 sneumann Exp $
- * (c) Copyright 2005 freiheit.com technologies gmbh, Germany.
- *
- * This file is part of Java for GnuPG  (http://www.freiheit.com).
- *
- * Java for GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * Please see COPYING for the complete licence.
- */
-
-package com.freiheit.gnupg;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-/**
-   Start here, because for all operations, you first need to create a
-   GnuPGContext. Use one context object for every single thread or
-   (really) take care about synchronizing access to the context from
-   different threads.
-   <p>
-   <em>How to create a context?</em>
-   <pre>
-   {@code
-     GnuPGContext ctx = new GnuPGContext();
-   }
-   </pre>
-   If you execute an operation, where GnuPG needs a passphrase
-   (password, mantra) from you, you need to tell the
-   library which Class is listening for such a request and is able to
-   deliver the entered passphrase to the library. You can implement
-   such a listener by yourself, but you can also use two
-   pre-fabricated ones. (Of course, normally you should install
-   gpg-agent/pinentry for this job...but some will need this ability
-   to get passphrases from a database or so. And: This release is not
-   checking for the existence of gpg-agent...so it won't work anyway.)
-   <p>
-   <em>How to add a Passphrase-Listener to read a password from the console?</em>
-   <pre>
-   {@code
-     ctx.setPassphraseListener(new GnuPGPassphraseConsole());
-     //caution: you can still see the password while you are typing...
-   }
-   </pre>
-   <em>How to add a Passphrase-Listener to read a password from the swing dialog?</em>
-   <pre>
-   {@code
-     ctx.setPassphraseListener(new GnuPGPassphraseWindow());
-   }
-   </pre>
-   @author Stefan Richter, stefan@freiheit.com
- */
-
-public class GnuPGContext extends GnuPGPeer{
-    private String _version;
-    private String _filename;
-    private String _reqversion;
-    private int _protocol;
-    private GnuPGPassphraseListener _passphraseListener = null;
-
-    /** Creates a new Context (use on context for one thread!)*/
-    public GnuPGContext(){
-        gpgmeGetEngineInfo();
-        setInternalRepresentation(gpgmeNew());
-    }
-
-    /**
-        Returns the version of the underlying GPGME lib version.
-        @return library version as String (like "1.1.1")
-    */
-    public String getVersion(){
-        return _version;
-    }
-
-    /**
-       Returns the executable gpg with path
-       @return gpg executable as String (like "/usr/bin/gpg")
-     */
-    public String getFilename(){
-        return _filename;
-    }
-
-
-    /**
-        Returns the required version of the underlying GPGME lib.
-
-        @return required library version as String (like "1.1.1")
-    */
-    public String getRequiredVersion(){
-        return _reqversion;
-    }
-
-    /**
-    Returns the used protocol of the crypto backend.
-
-    @return protocol
-    */
-    public int getProtocol(){
-        return _protocol;
-    }
-
-    /**
-       Tells you, is the gpg engine uses ASCII armor.
-       Please check GPG/GPGME for documentation if you don't know what this means.
-       (Try 'man gpg' on the command line and look for 'armor')
-
-       @return boolean true if results will be ASCII armored, if false binary
-     */
-    public boolean isArmor(){
-        long armorState = gpgmeGetArmor(getInternalRepresentation());
-        return (armorState == 1);
-    }
-
-    /**
-       Tell the gpg engine to use ASCII armor.
-       Please check GPG/GPGME for documentation if you don't know what this means.
-       (Try 'man gpg' on the command line and look for 'armor')
-
-       @param state set true if results should be ASCII armored, set false if binary
-     */
-    public void setArmor(boolean state){
-        long armorState = (state ? 1 : 0);
-        gpgmeSetArmor(getInternalRepresentation(), armorState);
-    }
-
-    /**
-       Tells you, is the gpg engine is in text mode.
-       Please check GPG/GPGME for documentation if you don't know what this means.
-
-       @return boolean true means text mode is on
-     */
-    public boolean isTextmode(){
-        boolean result = false;
-        long mode = gpgmeGetTextmode(getInternalRepresentation());
-        if(mode == 1){
-            result = true;
-        }
-        return result;
-    }
-
-    /**
-       Tell the gpg engine to set the text mode.
-       Please check GPG/GPGME for documentation if you don't know what this means.
-
-       @param state set true if you want text mode switched on
-     */
-    public void setTextmode(boolean state){
-        long mode = (state ? 1 : 0);
-        gpgmeSetTextmode(getInternalRepresentation(), mode);
-    }
-
-    /**
-       Sets a listener, if GPGME needs to request a passphrase
-       from the user (or even from a program or a database..)
-       <p>
-       A passphrase-listener is global to a jvm. This means,
-       you can register only <em>one</em> listener.
-       <p>
-       I am working on this, but it is not so easy to access
-       jvm methods from a specific object from a non-jvm thread,
-       which the passphrase callback is...
-
-       @param l a GnuPGPassphraseListener implementation
-
-       @see com.freiheit.gnupg.GnuPGPassphraseListener
-     */
-    public void setPassphraseListener(GnuPGPassphraseListener l){
-        _passphraseListener = l;
-    }
-
-    public String passphraseCallback(String hint, String passphraseInfo, long wasBad){
-        return _passphraseListener.getPassphrase(hint, passphraseInfo, wasBad);
-    }
-
-    private long[] getInternalRepresentationFromRecipients(GnuPGKey[] recipients) {
-        // note that these are pointers to addresses in the javagnupg shared lib
-        long recipientsInternals[] = new long[recipients.length];
-        for (int i=0; i < recipients.length; i++) {
-            if (recipients[i] != null)
-                recipientsInternals[i] = recipients[i].getInternalRepresentation();
-            else
-                ; // FIXME: throw exception here? Just skip over it for now.
-        }
-        return recipientsInternals;
-    }
-
-    private boolean hasNoRecipients(GnuPGKey[] recipients){
-        return !(recipients != null && recipients.length > 0);
-    }
-
-    /**
-       Gets the key with the supplied fingerprint from the keyring.
-       This is also kind of a factory method to generate key objects,
-       because you always need a context to access the keys in your keyring.
-
-       @param fingerprint gpg fingerprint (must be in your keyring)
-       @return GnuPGKey the key with the matching fingerprint
-
-       @see com.freiheit.gnupg.GnuPGKey
-     */
-    public GnuPGKey getKeyByFingerprint(String fingerprint) throws GnuPGException{
-        if(fingerprint == null || fingerprint.length() < 1) {
-            return null;
-        }
-        else{
-            return new GnuPGKey(this, fingerprint);
-        }
-    }
-
-    /**
-       Factory method to generate a GnuPGData-Object from a String.
-
-       @param data should not be null and should have a length > 0
-       @return GnuPGData null is data is null or empty, otherwise a GnuPGData-Object
-     */
-    public GnuPGData createDataObject(String data) throws GnuPGException{
-        if(data == null || data.length() < 1){
-            return null;
-        }
-        else{
-            return new GnuPGData(data);
-        }
-    }
-
-    /**
-       Factory method to generate a GnuPGData-Object from a byte array.
-
-       @param data should not be null and should have a length > 0
-       @return GnuPGData null is data is null or empty, otherwise a GnuPGData-Object
-     */
-    public GnuPGData createDataObject(byte[] data) throws GnuPGException{
-        if(data == null || data.length < 1){
-            return null;
-        }
-        else{
-            return new GnuPGData(data);
-        }
-    }
-
-    /**
-       Factory method to generate an empty GnuPGData-Object.
-
-       @param data should not be null and should have a length > 0
-       @return GnuPGData null is data is null or empty, otherwise a GnuPGData-Object
-     */
-    public GnuPGData createDataObject() throws GnuPGException{
-        return new GnuPGData();
-    }
-
-    /**
-       Convenience method to generate empty key arrays.
-       To encrypt data, you need to supply a list of recipients
-       in an array. This is a little helper. It will not search for
-       keys! Its just an empty array.
-
-       @param withLengthOf length of the array to generate (number of recipients)
-       @return GnuPGKey empty array of keys
-
-       @see com.freiheit.gnupg.GnuPGKey
-     */
-    public GnuPGKey[] generateEmptyKeyArray(int withLengthOf){
-        if(withLengthOf < 1){
-            return null;
-        }
-        else{
-            return new GnuPGKey[withLengthOf];
-        }
-    }
-
-    /**
-       Find all keys matching <em>query</em> in keyring.
-
-       @param query allows the same expressions as gpg on command line
-       @return GnuPGKey array of key objects with all matching keys
-
-       @see com.freiheit.gnupg.GnuPGKey
-     */
-    public GnuPGKey[] searchKeys(String query) throws GnuPGException{
-        if (query == null || query.length() < 1) {
-            return null;
-        } else{
-            return gpgmeKeylist(getInternalRepresentation(), query);
-        }
-    }
-
-    /**
-       Encrypts the data from <em>plain</em> with the public key
-       of each recipient. The result is stored in <em>cipher</em>.
-
-       @param recipients Array with the public keys of all recipients
-       @param plain text, that should be encrypted
-       @param cipher text, the encrypted plain text after method call
-
-       @see com.freiheit.gnupg.GnuPGData
-       @see com.freiheit.gnupg.GnuPGKey
-     */
-    public void encrypt(GnuPGKey[] recipients, GnuPGData plain, GnuPGData cipher) throws GnuPGException{
-        if (hasNoRecipients(recipients) || plain == null || cipher == null) throw new GnuPGException("Encryption-Arguments not complete.");
-
-        // note that these are pointers to addresses in the javagnupg shared lib
-        long recipientsInternals[] = getInternalRepresentationFromRecipients(recipients);
-        gpgmeOpEncrypt(this.getInternalRepresentation(), recipientsInternals,
-                       plain.getInternalRepresentation(), cipher.getInternalRepresentation());
-    }
-
-    /*
-       Not finished.
-     */
-//     public void encryptAndSign(GnuPGKey[] recipients, GnuPGData plain, GnuPGData cipher) throws GnuPGException{
-//         if (hasNoRecipients(recipients) || plain == null || cipher == null) throw new GnuPGException("Encryption-Arguments not complete.");
-
-//         long recipientsInternals[] = getInternalRepresentationFromRecipients(recipients);
-
-//         gpgmeOpEncryptSign(this.getInternalRepresentation(), recipientsInternals,
-//                            plain.getInternalRepresentation(), cipher.getInternalRepresentation());
-//     }
-
-    /**
-       Decrypts the data from <em>cipher</em> and stores the result
-       in <em>plain</em>.
-
-       @param cipher text, holds the cipher to be decrypted
-       @param plain text, holds the decrypted text after decryption
-
-       @see com.freiheit.gnupg.GnuPGData
-     */
-    public void decrypt(GnuPGData cipher, GnuPGData plain) throws GnuPGException{
-        if(_passphraseListener == null) throw new GnuPGException("Aborting: No GnuPGPassphraseListener set.");
-        if (cipher == null || plain == null) return;
-
-        gpgmeOpDecrypt(this.getInternalRepresentation(),
-                       cipher.getInternalRepresentation(), plain.getInternalRepresentation());
-    }
-
-    public void changePassphrase( GnuPGKey key ) throws GnuPGException {
-        if(_passphraseListener == null) throw new GnuPGException("Aborting: No GnuPGPassphraseListener set.");
-
-        if ( key == null ) return;
-
-        gpgmeOpChangePassphrase( this.getInternalRepresentation(), key.getInternalRepresentation() );
-
-    }
-
-
-    /*
-      Not finished.
-       Decrypts the data in <em>cipher</em> and verfies the signature on the <em>cipher</em>.
-
-       @param cipher encrypted and signed data
-       @param plain will contain the result after the method call
-     */
-//     public void decryptAndVerify(GnuPGData cipher, GnuPGData plain) throws GnuPGException{
-//         if(_passphraseListener == null) throw new GnuPGException("Aborting: No GnuPGPassphraseListener set.");
-//         if (cipher == null || plain == null) return;
-
-//         gpgmeOpDecryptVerify(this.getInternalRepresentation(),
-//                              cipher.getInternalRepresentation(), plain.getInternalRepresentation());
-//     }
-
-    /**
-       Signs the data in <em>plain</em> and stores the result in <em>signature</em>.
-
-       @param plain data that you want to sign
-       @param signature result of the operation
-     */
-    public void sign(GnuPGData plain, GnuPGData signature) throws GnuPGException{
-        if(_passphraseListener == null) throw new GnuPGException("Aborting: No GnuPGPassphraseListener set.");
-        if (plain == null || signature == null) throw new GnuPGException("Parameters not complete or null.");
-
-        gpgmeOpSign(this.getInternalRepresentation(),
-                    plain.getInternalRepresentation(), signature.getInternalRepresentation());
-    }
-
-    /**
-       Verifies a signature.
-
-       @param signature TODO
-       @param signed TODO
-       @param plain TODO
-     */
-    public void verify(GnuPGData signature, GnuPGData signed, GnuPGData plain) throws GnuPGException{
-        if (signature == null || signed == null|| plain == null)  throw new GnuPGException("Parameters not complete or null.");
-        gpgmeOpVerify(this.getInternalRepresentation(),
-                      signature.getInternalRepresentation(),
-                      signed.getInternalRepresentation(),
-                      plain.getInternalRepresentation());
-    }
-
-    /**
-       Adds a Signer to this context. All signature operation will uses
-       this/these signer(s), until you clear the signers from the context.
-       You remove all signers at once with a call to clearSigners().
-
-       @param key that should be used for signing operations
-
-       @see com.freiheit.gnupg.GnuPGKey
-     */
-    public void addSigner(GnuPGKey key) throws GnuPGException{
-        if(key == null)  throw new GnuPGException("Parameters not complete or null.");
-        gpgmeAddSigners(getInternalRepresentation(), key.getInternalRepresentation());
-    }
-
-    /**
-       Removes all signers from this context. You add Signers with addSigner().
-     */
-    public void clearSigners() throws GnuPGException{
-        gpgmeClearSigners(getInternalRepresentation());
-    }
-
-    /**
-       Imports a Key (private or public). You can supply the key in ASCII armor.
-     */
-    public void importKey(GnuPGData keydata) throws GnuPGException{
-        gpgmeOpImport(getInternalRepresentation(), keydata.getInternalRepresentation());
-    }
-
-    /**
-       This calls immediately the release method for the context
-       in the underlying gpgme library. This method is called by
-       the finalizer of the class anyway, but you can call it yourself
-       if you want to get rid of a context at once and don't want to
-       wait for the non-deterministic garbage-collector of the JVM.
-    */
-    public void destroy(){
-        if(getInternalRepresentation() != 0){
-            gpgmeRelease(getInternalRepresentation());
-            setInternalRepresentation(0);
-        }
-    }
-
-    /**
-       Releases underlying datastructures. Simple calls the destroy() method.
-     */
-    protected void finalize(){
-        destroy();
-    }
-
-    /**
-    Generates a new Key.
-    */
-    public void genKey(String params,GnuPGData pub, GnuPGData secret) throws GnuPGException{
-        gpgmeOpGenKey(getInternalRepresentation(),params);
-    }
-
-    /**
-    Sets the engine info for the context
-    */
-    public void setEngineInfo(int proto, String fileName, String homeDir){
-
-        // note that this is a pointer to and address in the javagnupg shared lib
-        long ctx = getInternalRepresentation();
-        gpgmeCtxSetEngineInfo(ctx,proto,fileName,homeDir);
-    }
-
-    /**
-     * Returns the result of a key generation. This must bedirectly called, after the key
-     * has been generated.
-     * @return the result of a key generation
-     */
-    public GnuPGGenkeyResult getGenkeyResult(){
-        return gpgmeOpGenkeyResult(getInternalRepresentation());
-
-    }
-
-    /**
-     * Export the keys defined by the pattern.
-     * @param pattern pattern for the keys
-     * @param reserved not used, must be set 0. For later use revered.
-     * @param data empty data object. Will be filled with the keys.
-     */
-    public void export(String pattern, long reserved, GnuPGData data){
-        gpgmeOpExport(getInternalRepresentation(), pattern, 0, data.getInternalRepresentation());
-    }
-
-
-    /**
-     * Deletes a Key from key ring. When allowSecret, a secret Key will be deleted
-     * @param key key to delete
-     * @param allowSecret if a secret key shall be deleted.
-     */
-    public void delete(GnuPGKey key, boolean allowSecret){
-        gpgmeOpDelete(getInternalRepresentation(),key.getInternalRepresentation(),allowSecret);
-    }
-    /* Native methods:
-       All these methods are implemented as JNI calls in:
-         GnuPGContext.c
-       The naming is as close as possible to the corresponding
-       GPGME methods. So, if you want to know what these methods
-       are actually doing: Please refer to the GPGME docs.
-     */
-    private native static void gpgmeCheckVersion();
-    private native void gpgmeGetEngineInfo();
-    private native long gpgmeNew();
-    private native void gpgmeOpEncrypt(long l, long[] recipientsInternals, long m, long n);
-    private native void gpgmeOpDecrypt(long l, long m, long n);
-    private native void gpgmeOpChangePassphrase(long l, long m );
-    private native void gpgmeRelease(long l);
-    @SuppressWarnings("unused")
-    private native void gpgmeOpEncryptSign(long context, int[] recipients, long plain, long cipher);
-    @SuppressWarnings("unused")
-    private native void gpgmeOpDecryptVerify(long context, long cipher, long plain);
-    private native void gpgmeOpSign(long context, long l, long m);
-    private native void gpgmeOpVerify(long context, long l, long m, long n);
-    private native GnuPGKey[] gpgmeKeylist(long l, String query);
-    private native void gpgmeAddSigners(long l, long m);
-    private native void gpgmeClearSigners(long context);
-    private native void gpgmeOpImport(long context, long l);
-    private native void gpgmeOpExport(long context, String pattern, long reserved, long l);
-    private native void gpgmeOpGenKey(long context,String params);
-    private native void gpgmeCtxSetEngineInfo(long context,int proto,String fileName,String homeDir);
-    private native GnuPGGenkeyResult gpgmeOpGenkeyResult(long context);
-    private native void gpgmeOpDelete(long context, long l, boolean allowSecret);
-
-    //getters/setters for members, no caching, always direct access to gpgme
-    private native long gpgmeGetArmor(long l);
-    private native void gpgmeSetArmor(long l, long state);
-    private native long gpgmeGetTextmode(long l);
-    private native void gpgmeSetTextmode(long l, long state);
-
-    private static final String NATIVE_LIBRARY_BASENAME = "libjavagnupg";
-
-    /*
-      It is not possible, to load a shared library directly
-      from a Jar-Archive. But there is an acceptable workaround:
-      - Put the shared library in the Jar-Archive
-      - When the classes get loaded:
-        - read the shared library from the Jar-Archive
-        - save it to the standard temp location in the file systems on this platform
-        - load it from there
-        - tell java, to automatically get rid of the lib, when the JVM exits (deleteOnExit)
-
-      This way, the library containing the JNI calls must not be installed extra.
-      It is delivered inside the Jar-Archive, stored temporarily and disappears on exit.
-     */
-    static {
-        // TODO all this guessing is still rather rough, however it will work
-        // with most *ix systems and *MAY* work with Windows once we've come
-        // to test such a setup...
-        String nativeLibraryExtension = getNativeLibraryExtension();
-
-        System.out.println("guessed native library extension " + nativeLibraryExtension);
-
-        String libName = getNativeLibraryName();
-
-        System.out.println("guessed native library name " + libName);
-
-        try{
-            InputStream in = GnuPGContext.class.getResource(libName).openStream();
-            File tempLib = File.createTempFile(NATIVE_LIBRARY_BASENAME, "." + nativeLibraryExtension);
-            FileOutputStream out = new FileOutputStream(tempLib);
-            byte[] buf = new byte[4096];
-            for (int i = in.read(buf); i != -1; i = in.read(buf)){
-                out.write(buf, 0, i);
-            }
-            out.close();
-            tempLib.deleteOnExit();
-            System.out.println("Trying to load temporary library: " +  tempLib.getPath());
-            System.load(tempLib.getPath());
-            //This call is really important, as it initializes the GPGME thread system!!!!
-            gpgmeCheckVersion();//FIXME: But: This is NOT working correctly!!!
-            //----------------------------------------------------------------------------
-        }
-        catch(Throwable e){
-            System.out.println("Unable to load shared library from Jar-File.");
-            System.out.println("Maybe GnuPG for Java is not allowed to write to your disk? (Access problems?)");
-            System.out.println("Or the used GnuPG jar-file is not compiled for the current environment/architecture (JavaGnuPG is platform dependent!).");
-            System.out.println(e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-
-
-    /**
-     * Determines the native library name for the system this is running on.
-     * If running on unix, we also try to guess the architecture's bit-ness
-     * which has an impact on the library's name
-     * @return the name
-     */
-    private static String getNativeLibraryName() {
-
-        // if all fails we assume windblows
-        String libName = "/c/javagnupg";
-
-        try {
-            ProcessBuilder pb = new ProcessBuilder(new String[] { "/bin/uname", "-m" });
-            pb.redirectErrorStream(true);
-            Process p = pb.start();
-            InputStreamReader isr = new InputStreamReader(p.getInputStream());
-            BufferedReader br = new BufferedReader(isr);
-
-            StringBuilder sb = new StringBuilder();
-            String line = null;
-
-            while ((line = br.readLine()) != null) {
-                //System.out.println(line);
-                sb.append(line + "\n");
-            }
-
-            String uName = sb.toString().trim();
-            libName = uName.endsWith("_64") ? "/c/libjavagnupg.64" : "/c/libjavagnupg.32";
-        } catch (Exception e) {
-            System.err.println("Cannot execute 'uname'. Probably running on a non unix environment.");
-            /* nothing here, may add some debug output */
-            e.printStackTrace();
-        }
-
-        return libName + "." + getNativeLibraryExtension();
-    }
-
-    /**
-     * Guesses the native library extension for the system this is running on.
-     * On unix systems, the extension is "so", on windows it is "dll".
-     * @return the extension
-     */
-    private static String getNativeLibraryExtension() {
-
-        // try to detect a unix system
-        File libDir = null;
-        for (String dirName : new String[] { "/lib", "/usr/lib" }) {
-            libDir = new File(dirName);
-            if (libDir.exists() && libDir.isDirectory()) {
-                String[] found = libDir.list();
-                if (found != null && found.length > 0) {
-                    for (String file : found) {
-                        // if we find any file matching lib*.so, we assume unix
-                        if (file.startsWith("lib") && file.endsWith(".so")) {
-                            return "so";
-                        }
-                    }
-                }
-            }
-        }
-
-        // could not detect a unix system? assume winblows...
-        return "dll";
-    }
-}
-
-/*
- * Local variables:
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * compile-command: "ant -emacs -find build.xml"
- * End:
- */
diff --git a/src/java/com/freiheit/gnupg/GnuPGData.java b/src/java/com/freiheit/gnupg/GnuPGData.java
deleted file mode 100644
index 41ca3a8..0000000
--- a/src/java/com/freiheit/gnupg/GnuPGData.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * $Id: GnuPGData.java,v 1.1 2005/01/24 13:56:58 stefan Exp $
- * (c) Copyright 2005 freiheit.com technologies gmbh, Germany.
- *
- * This file is part of Java for GnuPG  (http://www.freiheit.com).
- *
- * Java for GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * Please see COPYING for the complete licence.
- */
-
-package com.freiheit.gnupg;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
-   Holds the data that you want to work on and stores the results
-   of crypto operations.
-
-   @author Stefan Richter, stefan@freiheit.com
- */
-public class GnuPGData extends GnuPGPeer{
-
-    /**
-       Use the factory methods from GnuPGContext to
-       generate GnuPGData-Objects.
-       Generates an empty data object. Use this, if you want
-       to create a data object to hold a result from a crypto
-       operation.
-     */
-    protected GnuPGData(){
-        setInternalRepresentation(gpgmeDataNew());
-    }
-
-    /*
-       Use the factory methods from GnuPGContext to
-       generate GnuPGData-Objects.
-       FIXME: This is not working! Use it, and it will crash the JVM.
-    */
-//     public GnuPGData(File f) throws IOException{
-//         this();
-//         if(f != null && f.exists() && !f.isDirectory() && f.canRead()){
-//             FileInputStream fin = new FileInputStream(f);
-//             this.read(fin);
-//         }
-//     }
-
-    /**
-       Use the factory methods from GnuPGContext to
-       generate GnuPGData-Objects.
-       Generates a new data object containing the given String.
-
-       @param str your string
-     */
-    protected GnuPGData(String str){
-        this(str.getBytes());
-    }
-
-    /**
-       Use the factory methods from GnuPGContext to
-       generate GnuPGData-Objects.
-       Generates a new Data-Object containing the given byte array.
-
-       @param data your data
-     */
-    protected GnuPGData(byte[] data){
-        long gpgmeDataNewFromMem = gpgmeDataNewFromMem(data);
-        setInternalRepresentation(gpgmeDataNewFromMem);
-    }
-
-
-    /*
-       FIXME: This is not working! Use it, and it will crash the JVM.
-    */
-//     public void read(InputStream in) throws IOException{
-//         if(in != null){
-//             gpgmeDataRead(getInternalRepresentation(), in);
-//         }
-//     }
-
-    /**
-       Writes the data/string contained in this data object
-       to the given Java OutputStream.
-
-       @param out OutputStream, where the data/string should be written
-     */
-    public void write(OutputStream out) throws IOException{
-        if (out != null) {
-            gpgmeDataWrite(getInternalRepresentation(), out);
-        }
-    }
-
-    /**
-       Helper method to print out the data/string from this data object.
-
-       @return String representation of the data contained in this data object (expect weired results with binary data)
-     */
-    public String toString(){
-        String result = null;
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try{
-            this.write(baos);
-            result = baos.toString();
-        }
-        catch(IOException ioe){
-            result = ioe.getMessage();
-        }
-        return result;
-    }
-
-    /**
-       This calls immediately the release method for the datastructure
-       in the underlying gpgme library. This method is called by
-       the finalizer of the class anyway, but you can call it yourself
-       if you want to get rid of this datastructure at once and don't want to
-       wait for the non-deterministic garbage-collector of the JVM.
-    */
-    public void destroy(){
-        if(getInternalRepresentation() != 0){
-            gpgmeDataRelease(getInternalRepresentation());
-            setInternalRepresentation(0);
-        }
-    }
-
-    /**
-       Releases underlying datastructures. Simple calls the destroy() method.
-     */
-    protected void finalize(){
-        destroy();
-    }
-
-    private native long gpgmeDataNewFromMem(byte[] plain);
-    private native long gpgmeDataNew();
-    private native void gpgmeDataWrite(long l, OutputStream out) throws IOException;
-    private native void gpgmeDataRelease(long l);
-    @SuppressWarnings("unused")
-    private native void gpgmeDataRead(long data, InputStream in) throws IOException;
-}
-/*
- * Local variables:
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * compile-command: "ant -emacs -find build.xml"
- * End:
- */
diff --git a/src/java/com/freiheit/gnupg/GnuPGKey.java b/src/java/com/freiheit/gnupg/GnuPGKey.java
deleted file mode 100644
index 315bb16..0000000
--- a/src/java/com/freiheit/gnupg/GnuPGKey.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * $Id: GnuPGKey.java,v 1.1 2005/01/24 13:56:58 stefan Exp $
- * (c) Copyright 2005 freiheit.com technologies gmbh, Germany.
- *
- * This file is part of Java for GnuPG  (http://www.freiheit.com).
- *
- * Java for GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * Please see COPYING for the complete licence.
- */
-package com.freiheit.gnupg;
-
-import java.util.Iterator;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
-   Represents a key.
-   You can manage and find keys using GnuPGContext. You can not
-   instantiate a key by yourself. You always need a context.
-
-   @see com.freiheit.gnupg.GnuPGContext
-
-   @author Stefan Richter, stefan@freiheit.com
- */
-public class GnuPGKey extends GnuPGPeer{
-    /**
-       This constructor is only called from within the JNI routines.
-       This is for example used, when a keylist search returns keys.
-       This is how then each key is instantiated on the java side from c.
-     */
-    protected GnuPGKey(long ptr) {
-        // note that this is a pointer to an address in the javagnupg shared lib
-         setInternalRepresentation(ptr);
-    }
-
-    protected GnuPGKey(GnuPGContext context, String fingerprint){
-         setInternalRepresentation(gpgmeGetKey(context.getInternalRepresentation(), fingerprint));
-    }
-
-    /**
-       Get the Name of the default key/userid.
-     */
-    public String getName(){
-        return gpgmeGetName(getInternalRepresentation());
-    }
-
-    /**
-       Get the Email-Address of the default key/userid.
-     */
-    public String getEmail(){
-        return gpgmeGetEmail(getInternalRepresentation());
-    }
-
-    /**
-       Get the Key-ID of the default key/userid.
-     */
-    public String getKeyID(){
-        return gpgmeGetKeyID(getInternalRepresentation());
-    }
-
-    /**
-       Get the Fingerprint of the default key/userid.
-     */
-    public String getFingerprint(){
-        return gpgmeGetFingerprint(getInternalRepresentation());
-    }
-
-    /**
-       Get the Comment of the default key/userid.
-     */
-    public String getComment(){
-        return gpgmeGetComment(getInternalRepresentation());
-    }
-
-    /**
-       Get the User-ID of the default key/userid.
-     */
-    public String getUserID(){
-        return gpgmeGetUserID(getInternalRepresentation());
-    }
-
-    /**
-       Lists all signatures of the default key/userid.
-       Every key can have multiple signatures. Signatures can
-       be incomplete. This means, that not all details (name, email-address etc.)
-       were downloaded from a keyserver. But you will at least see
-       the key-id of the signature. Use GnuPG to --refresh-keys if you
-       want to see all signature details.
-       <p>
-       Currently I am not supporting java generics for a type safe iterator,
-       because there are to many people still using jdk-1.4.x without generics support.
-       This will be changed on increasing demand.
-       <p>
-       @return Iterator of GnuPGSignature objects
-
-       @see com.freiheit.gnupg.GnuPGSignature
-     */
-    public Iterator/*<GnuPGSignatures>*/ getSignatures(){
-        List<GnuPGSignature> siglist = null;
-        GnuPGSignature sig = getSignature();
-        while (sig != null){
-            if (siglist == null){
-                siglist = new ArrayList<GnuPGSignature>();
-            }
-            siglist.add(sig);
-            sig = sig.getNextSignature();
-        }
-        return siglist.listIterator();
-    }
-
-    /**
-       Helper to list signatures in the toString()-method.
-     */
-    private String listSignatures(){
-        Iterator iter = getSignatures();
-        GnuPGSignature sig;
-        StringBuffer buf = new StringBuffer();
-
-        while(iter != null && iter.hasNext()){
-            sig = (GnuPGSignature)iter.next();
-            buf.append("\t").append(sig).append("\n");
-        }
-
-        return buf.toString();
-    }
-
-    /**
-       Helper to get the head of the linked list
-       of signatures from the native space.
-     */
-    private GnuPGSignature getSignature(){
-        GnuPGSignature result = null;
-
-        // note that thhis is a pointer to an address in the javagnupg shared lib
-        long ptr = gpgmeGetSignature(getInternalRepresentation());
-
-        if (ptr != 0){
-            result = new GnuPGSignature(ptr);
-        }
-
-        return result;
-    }
-
-    /**
-       Return this key with all of its signatures.
-       @return String multiline text with one key and 0..many signatures
-     */
-    public String toString(){
-        StringBuffer buf = new StringBuffer();
-        buf.append(getKeyID()).
-            append(": ").
-            append(getName()).
-            append(", ").
-            append(getComment()).
-            append(", ").
-            append(getEmail()).
-            append(", ").
-            append("[").
-            append(getFingerprint()).
-            append("]").
-            append("\n").
-            append(listSignatures());
-        return buf.toString(); 
-    }
-
-    /**
-       This calls immediately the release method for the datastructure
-       in the underlying gpgme library. This method is called by
-       the finalizer of the class anyway, but you can call it yourself
-       if you want to get rid of this datastructure at once and don't want to
-       wait for the non-deterministic garbage-collector of the JVM.
-    */
-    public void destroy(){
-        if(getInternalRepresentation() != 0){
-            gpgmeKeyUnref(getInternalRepresentation());
-            setInternalRepresentation(0);
-        }
-    }
-
-    /**
-       Releases underlying datastructures. Simple calls the destroy() method.
-     */
-    protected void finalize(){
-        destroy();
-    }
-
-    private native long gpgmeGetKey(long context, String fingerprint);
-    private native long gpgmeKeyUnref(long keyptr);
-    private native String gpgmeGetName(long keyptr);
-    private native String gpgmeGetEmail(long keyptr);
-    private native String gpgmeGetKeyID(long keyptr);
-    private native String gpgmeGetFingerprint(long keyptr);
-    private native String gpgmeGetComment(long keyptr);
-    private native String gpgmeGetUserID(long keyptr);
-    private native long gpgmeGetSignature(long keyptr);
-}
-/*
- * Local variables:
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * compile-command: "ant -emacs -find build.xml"
- * End:
- */
diff --git a/src/java/com/freiheit/gnupg/GnuPGPassphraseConsole.java b/src/java/com/freiheit/gnupg/GnuPGPassphraseConsole.java
deleted file mode 100644
index bc6fd11..0000000
--- a/src/java/com/freiheit/gnupg/GnuPGPassphraseConsole.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * $Id: GnuPGPassphraseConsole.java,v 1.1 2005/01/24 13:56:58 stefan Exp $
- * (c) Copyright 2005 freiheit.com technologies gmbh, Germany.
- *
- * This file is part of Java for GnuPG  (http://www.freiheit.com).
- *
- * Java for GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * Please see COPYING for the complete licence.
- */
-package com.freiheit.gnupg;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.IOException;
-
-/**
-   Requests a passphrase for a crypto operation from the command line.
-   This is triggered by gpgme. You must register this as a listener
-   to the GnuPGContext. <b>It stills echoes the passphrase on the console.
-   Remember, this is an alpha release...</b>
-
-   @see com.freiheit.gnupg.GnuPGContext
-
-   @author Stefan Richter, stefan@freiheit.com
- */
-public class GnuPGPassphraseConsole implements GnuPGPassphraseListener{
-    private BufferedReader _reader;
-
-    /**
-       Default-Constructor.
-     */
-    public GnuPGPassphraseConsole(){
-        _reader = new BufferedReader(new InputStreamReader(System.in));
-    }
-
-    /**
-       Prints to the console, asks for the passphrase and returns it to gpgme.
-     */
-    public String getPassphrase(String hint, String passphraseInfo, long wasBad){
-        StringBuffer prompt = new StringBuffer("Enter GnuPG Passphrase (");
-        prompt.append(hint).append("): ");
-        System.out.print(prompt.toString());
-        String line = null;
-        try{
-            line = _reader.readLine();
-        }
-        catch(IOException e){
-            e.printStackTrace();
-            return null;
-        }
-        return line;
-    }
-}
-/*
- * Local variables:
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * compile-command: "ant -emacs -find build.xml"
- * End:
- */
diff --git a/src/java/com/freiheit/gnupg/GnuPGPassphraseListener.java b/src/java/com/freiheit/gnupg/GnuPGPassphraseListener.java
deleted file mode 100644
index 1fe9f77..0000000
--- a/src/java/com/freiheit/gnupg/GnuPGPassphraseListener.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * $Id: GnuPGPassphraseListener.java,v 1.1 2005/01/24 13:56:58 stefan Exp $
- * (c) Copyright 2005 freiheit.com technologies gmbh, Germany.
- *
- * This file is part of Java for GnuPG  (http://www.freiheit.com).
- *
- * Java for GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * Please see COPYING for the complete licence.
- */
-package com.freiheit.gnupg;
-
-/**
-   This is the listener interface you need to implement, if you want
-   to react to the passphrase callbacks of the gpgme library for
-   yourself.  In this way, you can for example lookup passphrases from a
-   database or so and return them to gpgme.
-
-   There are also two pre-fabricated listener.
-   @see com.freiheit.gnupg.GnuPGPassphraseWindow
-   @see com.freiheit.gnupg.GnuPGPassphraseConsole
-
-   @author Stefan Richter, stefan@freiheit.com
- */
-public interface GnuPGPassphraseListener{
-    /**
-       This method will be called by gpgme, if a passphrase is necessary
-       to complete a crypto operation.
-
-       Implement this interface and register it with the GnuPGContext
-       on which you are operating.
-
-       @param hint TODO
-       @param passphraseInfo TODO
-       @param wasBad TODO
-
-       @return passphrase to be supplied to gpgme callback (MUST include a \n at the end of the string)
-
-       @see com.freiheit.gnupg.GnuPGContext
-     */
-    public String getPassphrase(String hint, String passphraseInfo, long wasBad);
-}
-/*
- * Local variables:
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * compile-command: "ant -emacs -find build.xml"
- * End:
- */
diff --git a/src/java/com/freiheit/gnupg/GnuPGPassphraseWindow.java b/src/java/com/freiheit/gnupg/GnuPGPassphraseWindow.java
deleted file mode 100644
index 3b52a5a..0000000
--- a/src/java/com/freiheit/gnupg/GnuPGPassphraseWindow.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * $Id: GnuPGPassphraseWindow.java,v 1.2 2005/01/28 16:05:44 stefan Exp $
- * (c) Copyright 2005 freiheit.com technologies gmbh, Germany.
- *
- * This file is part of Java for GnuPG  (http://www.freiheit.com).
- *
- * Java for GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * Please see COPYING for the complete licence.
- */
-package com.freiheit.gnupg;
-
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.JPasswordField;
-
-/**
-   Requests a passphrase for a crypto operation from the a swing dialog.
-   This is triggered by gpgme. You must register this as a listener
-   to the GnuPGContext. It generates a Swing-Dialog.
-
-   @see com.freiheit.gnupg.GnuPGContext
-
-   @author Stefan Richter, stefan@freiheit.com
- */
-public class GnuPGPassphraseWindow implements GnuPGPassphraseListener{
-    private JFrame _win;
-    private boolean _internalWin;
-
-    /**
-       Default-Constructor.
-     */
-    public GnuPGPassphraseWindow(){
-        this((JFrame)null);
-    }
-
-    /**
-       Use this, if you use this library from a swing application.
-       @param f where this passphrase dialog should be modal to.
-       (See Swing-Documentation, if you don't know, what modal dialogs are!)
-     */
-    public GnuPGPassphraseWindow(JFrame f){
-        if(f != null){
-            _win = f;
-            _internalWin = false;
-        }
-        else{
-            _win = new JFrame("GnuPG for Java - freiheit.com technologies gmbh, 2004");
-            _internalWin = true;
-        }
-    }
-
-    /**
-       Opens a Swing modal dialog, asks for the passphrase and returns it to gpgme.
-     */
-    public String getPassphrase(String hint, String passphraseInfo, long wasBad){
-        JPasswordField passwordField = new JPasswordField(20);
-        JOptionPane optionPane = new JOptionPane();
-        optionPane.setMessage( new Object[] { hint, passwordField } );
-        optionPane.setMessageType( JOptionPane.QUESTION_MESSAGE );
-        optionPane.setOptionType( JOptionPane.OK_CANCEL_OPTION );
-        JDialog dialog = optionPane.createDialog( _win, "Enter GnuPG Passphrase and click OK..." );
-        dialog.setVisible(true);
-        Integer value = (Integer)optionPane.getValue();
-        if (value.intValue() == JOptionPane.CANCEL_OPTION || value.intValue() == JOptionPane.CLOSED_OPTION ){
-            dialog.dispose();
-            if(_internalWin){
-                _win.dispose();
-            }
-            return null;
-        }
-        else{
-            StringBuffer buf = new StringBuffer();
-            //the newline is REALLY important for gpgme. Don't remove it!
-            //FIXME: I also add one newline in the native code, but there is still an error condition
-            buf.append(passwordField.getPassword()).append("\n");
-            String passphrase = buf.toString();
-            dialog.dispose();
-            if(_internalWin){
-                _win.dispose();
-            }
-            return passphrase;
-        }
-    }
-}
-/*
- * Local variables:
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * compile-command: "ant -emacs -find build.xml"
- * End:
- */
diff --git a/src/java/com/freiheit/gnupg/GnuPGPeer.java b/src/java/com/freiheit/gnupg/GnuPGPeer.java
deleted file mode 100644
index 943e3f6..0000000
--- a/src/java/com/freiheit/gnupg/GnuPGPeer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * $Id: GnuPGPeer.java,v 1.1 2005/01/24 13:56:58 stefan Exp $
- * (c) Copyright 2005 freiheit.com technologies gmbh, Germany.
- *
- * This file is part of Java for GnuPG  (http://www.freiheit.com).
- *
- * Java for GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * Please see COPYING for the complete licence.
- */
-package com.freiheit.gnupg;
-
-/**
-   Peer Class to hold the pointers to connect to the underlying gpgme library.
-   This is the base class for all GnuPG*.java Classes. DO NOT USE IT.
-   It is not intended for library users.
-
-   @author Stefan Richter, stefan@freiheit.com
- */
-public class GnuPGPeer{
-    // note that this is a pointer to an address in the javagnupg shared lib
-    protected long _internalRepresentation;
-
-    /**
-       DO NOT USE IT. This is only use from inside the library.
-     */
-    protected void setInternalRepresentation(long ptr){
-         // note that this is a pointer to an address in the javagnupg shared lib
-        _internalRepresentation = ptr;
-    }
-
-    /**
-       DO NOT USE IT. This is only use from inside the library.
-     */
-    protected long getInternalRepresentation(){
-         // note that this is a pointer to an address in the javagnupg shared lib
-        return _internalRepresentation;
-    }
-}
-/*
- * Local variables:
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * compile-command: "ant -emacs -find build.xml"
- * End:
- */
diff --git a/src/java/com/freiheit/gnupg/GnuPGSignature.java b/src/java/com/freiheit/gnupg/GnuPGSignature.java
deleted file mode 100644
index bf19229..0000000
--- a/src/java/com/freiheit/gnupg/GnuPGSignature.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * $Id: GnuPGSignature.java,v 1.1 2005/01/24 13:56:58 stefan Exp $
- * (c) Copyright 2005 freiheit.com technologies gmbh, Germany.
- *
- * This file is part of Java for GnuPG  (http://www.freiheit.com).
- *
- * Java for GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * Please see COPYING for the complete licence.
- */
-
-package com.freiheit.gnupg;
-
-/**
-   Represents a signature from a key.
-
-   A signature doesn't stand alone. It is always bound to a key.
-   So if you want to see a signature, you first have to get a key 
-   via the GnuPGContext.
-   <p>
-   This class accesses directly the corresponding structure "under the hood"
-   and stores no data in java members. This means, that every call of
-   a method also results in a native call to access gpgme memory.
-   
-   @author Stefan Richter, stefan@freiheit.com
-
-   @see com.freiheit.gnupg.GnuPGContext
- */
-public class GnuPGSignature extends GnuPGPeer{
-
-    /**
-       This constructor is only called from GnuPGKey. It is called
-       when the lib browses thru the linked list of signatures of each key.
-
-       @see com.freiheit.gnupg.GnuPGKey
-     */
-    protected GnuPGSignature(long ptr){
-         // note that this is a pointer to an address in the javagnupg shared lib
-         setInternalRepresentation(ptr);
-    }
-
-    /**
-       Is signature key revoked?
-
-       @return true, if revoked
-     */
-    public boolean isRevoked(){
-        return gpgmeGetRevoked(getInternalRepresentation());
-    }
-
-    /**
-       Is signature key expired?
-
-       @return true, if expired
-     */
-    public boolean isExpired(){
-        return gpgmeGetExpired(getInternalRepresentation());
-    }
-
-    /**
-       Is signature key invalid?
-
-       @return true, if invalid
-     */
-    public boolean isInvalid(){
-        return gpgmeGetInvalid(getInternalRepresentation());
-    }
-
-    /**
-       Is signature key exportable?
-
-       @return true, if exportable
-     */
-    public boolean isExportable(){
-        return gpgmeGetExportable(getInternalRepresentation());
-    }
-
-    /**
-       Returns Key-ID of signature key.
-
-       @return Key-ID
-     */
-    public String getKeyID(){
-        return gpgmeGetKeyID(getInternalRepresentation());
-    }
-
-    /**
-       Returns User-ID of signer.
-
-       @return User-ID
-     */
-    public String getUserID(){
-        return gpgmeGetUserID(getInternalRepresentation());
-    }
-
-    /**
-       Returns Name of signer.
-
-       @return Name
-     */
-    public String getName(){
-        return gpgmeGetName(getInternalRepresentation());
-    }
-
-    /**
-       Returns Email-Address of signer.
-
-       @return Email-Address
-     */
-    public String getEmail(){
-        return gpgmeGetEmail(getInternalRepresentation());
-    }
-
-    /**
-       Returns Comment.
-
-       @return Comment
-     */
-    public String getComment(){
-        return gpgmeGetComment(getInternalRepresentation());
-    }
-
-    /**
-       Checks, if all signature details are available.
-
-       @return true, if more info than the keyid is available
-     */
-    public boolean hasDetails(){
-        return !getName().equals("");
-    }
-
-    /**
-       String-Representation of this Signature.
-
-       @return String single line of text with name, comment etc.
-     */
-    public String toString(){
-        StringBuffer buf = new StringBuffer();
-        buf.append(getKeyID());
-        if(hasDetails()){
-            buf.append(", ");
-            buf.append(getName());
-            buf.append(", ");
-            buf.append(getComment());
-            buf.append(", ");
-            buf.append(getEmail());
-        }
-        else{
-            buf.append(" <No details available.>");
-        }
-        return buf.toString();
-    }
-
-    /**
-       Gets the next pointer in the gpgme_key_sig_t structure.
-
-       @return new GnuPGSignature-Object
-     */
-    protected GnuPGSignature getNextSignature(){
-        GnuPGSignature result = null;
-
-         // note that this is a pointer to an address in the javagnupg shared lib
-        long next = gpgmeGetNextSignature(getInternalRepresentation());
-
-        if(next != 0){
-            result = new GnuPGSignature(next);
-        }
-
-        return result;
-    }
-
-    //native method declarations:
-    private native boolean gpgmeGetRevoked(long l); 
-    private native boolean gpgmeGetExpired(long l);
-    private native boolean gpgmeGetInvalid(long l);
-    private native boolean gpgmeGetExportable(long l);
-
-    private native String gpgmeGetKeyID(long l);
-    private native String gpgmeGetUserID(long l);
-    private native String gpgmeGetName(long l);
-    private native String gpgmeGetEmail(long l);
-    private native String gpgmeGetComment(long l);
-
-    private native long gpgmeGetNextSignature(long l);
-
-}
-
-/*
- * Local variables:
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * compile-command: "ant -emacs -find build.xml"
- * End:
- */
diff --git a/tests/android-signing-key.p12 b/tests/android-signing-key.p12
new file mode 100644
index 0000000..0a9bec8
Binary files /dev/null and b/tests/android-signing-key.p12 differ
diff --git a/tests/icon-encrypted-not-signed.png.gpg b/tests/icon-encrypted-not-signed.png.gpg
new file mode 100644
index 0000000..6172f87
Binary files /dev/null and b/tests/icon-encrypted-not-signed.png.gpg differ
diff --git a/tests/icon.png b/tests/icon.png
new file mode 100644
index 0000000..5c58dc7
Binary files /dev/null and b/tests/icon.png differ
diff --git a/tests/icon.png.asc b/tests/icon.png.asc
new file mode 100644
index 0000000..070c840
--- /dev/null
+++ b/tests/icon.png.asc
@@ -0,0 +1,214 @@
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+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
+IKzU4PSn8n8A
+=jw1k
+-----END PGP MESSAGE-----
diff --git a/tests/icon.png.gpg b/tests/icon.png.gpg
new file mode 100644
index 0000000..7d38bdc
Binary files /dev/null and b/tests/icon.png.gpg differ
diff --git a/tests/icon.png.sig b/tests/icon.png.sig
new file mode 100644
index 0000000..97ef5c6
Binary files /dev/null and b/tests/icon.png.sig differ
diff --git a/tests/one-public-key.pkr b/tests/one-public-key.pkr
new file mode 100644
index 0000000..93dc80a
Binary files /dev/null and b/tests/one-public-key.pkr differ
diff --git a/tests/public-keys.pkr b/tests/public-keys.pkr
new file mode 100644
index 0000000..024e45e
Binary files /dev/null and b/tests/public-keys.pkr differ
diff --git a/tests/public-keys.pkr.asc b/tests/public-keys.pkr.asc
new file mode 100644
index 0000000..7130d3b
--- /dev/null
+++ b/tests/public-keys.pkr.asc
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAABCAAGBQJR32MjAAoJEJ8P5Yc3S76BkOQQAIxFNiKR03Dv5cI5jpRhFFR7
+eVx3JXT1lJL342F41XKuDAy79PoCu5/Wx3smVXV76LWNcDVW9UWhywVJUQYYq0iL
+7yLYA+KdcMuFpZW/SbpnLyKgUlvw9FesUO1Y6W1f4BOSNIJmUwqvAXOKFngV2kQI
+5p9hua9jpY9v+iz16ctGvQvbwWlRS+0qU7nnSfv4r0i8U7a/PD47UftZW+mQn/aa
+UD8EWS7PzSPHHeakqzo8lp8HYrjK0u44izpIOwDAugOkWy97Fe6y/qvzGuVszVWC
+KcC9isfFHCkn5HnGsoSb2oOeqNXwoJVgQTw5Q8z9E/ZbOPFXvr2Y5eQYv6pCkvq/
+S8GuWnNtQYUU7nN127HzD956oq9yq/4Q28jeeCsvyzH4Uji7g6RaxuHVp9nzoQzI
+cpxuNR5wMG83nsFpmSjoKKkt43sFsVa0EY/tOlZ+nSBG3zz7vR6XWK+pbLhpwu4t
+JHtNqL65xyCH3ItgEUoxYMeUZFieWTzEjaPgAHdd1f46P3idnchgOqPvhXYQrOob
+CMH9BSttSslkrvynZI/iSj5vU+NH+ptm3+qpZ3fQ0gcmCaKkY6ige5dlDK/t1Bd2
+0dPoqFJdg00hX04sFVIlbu138osG762xfy6BkqUvUQIfUaFeFf3phCmebwmTRI/0
+HJOBT9+804m6uIdtwqi0
+=woib
+-----END PGP SIGNATURE-----
diff --git a/tests/public-keys.pkr.sig b/tests/public-keys.pkr.sig
new file mode 100644
index 0000000..558f928
Binary files /dev/null and b/tests/public-keys.pkr.sig differ
diff --git a/tests/pubring.gpg b/tests/pubring.gpg
new file mode 100644
index 0000000..5882e73
Binary files /dev/null and b/tests/pubring.gpg differ
diff --git a/tests/secret b/tests/secret
new file mode 100644
index 0000000..a9b5729
--- /dev/null
+++ b/tests/secret
@@ -0,0 +1 @@
+Attack across river at dawn.
diff --git a/tests/secret-keys.skr b/tests/secret-keys.skr
new file mode 100644
index 0000000..53332d0
Binary files /dev/null and b/tests/secret-keys.skr differ
diff --git a/tests/secret.gpg b/tests/secret.gpg
new file mode 100644
index 0000000..ec5d349
Binary files /dev/null and b/tests/secret.gpg differ
diff --git a/tests/secring.gpg b/tests/secring.gpg
new file mode 100644
index 0000000..8e28f09
Binary files /dev/null and b/tests/secring.gpg differ
diff --git a/tests/trustdb.gpg b/tests/trustdb.gpg
new file mode 100644
index 0000000..c497711
Binary files /dev/null and b/tests/trustdb.gpg differ