diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index d75350048..219cf2751 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -474,7 +474,7 @@
             android:label="TODO reg"
             android:process=":crypto" >
             <intent-filter>
-                <action android:name="com.android.crypto.REGISTER" />
+                <action android:name="org.openintents.crypto.REGISTER" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -486,7 +486,7 @@
             android:exported="true"
             android:process=":crypto" >
             <intent-filter>
-                <action android:name="com.android.crypto.ICryptoService" />
+                <action android:name="org.openintents.crypto.ICryptoService" />
             </intent-filter>
 
             <meta-data
diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoError.aidl b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.aidl
similarity index 95%
rename from OpenPGP-Keychain/src/com/android/crypto/CryptoError.aidl
rename to OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.aidl
index d1b941212..7b67c8995 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/CryptoError.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.aidl
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package com.android.crypto;
+package org.openintents.crypto;
 
 // Declare CryptoError so AIDL can find it and knows that it implements the parcelable protocol.
 parcelable CryptoError;
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoError.java b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.java
similarity index 98%
rename from OpenPGP-Keychain/src/com/android/crypto/CryptoError.java
rename to OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.java
index 9540f4f68..265fe2633 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/CryptoError.java
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoError.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.crypto;
+package org.openintents.crypto;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoServiceConnection.java
similarity index 94%
rename from OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java
rename to OpenPGP-Keychain/src/org/openintents/crypto/CryptoServiceConnection.java
index 96a07a067..5df32dcf9 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/CryptoServiceConnection.java
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoServiceConnection.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.crypto;
+package org.openintents.crypto;
+
+import org.openintents.crypto.ICryptoService;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -66,7 +68,7 @@ public class CryptoServiceConnection {
                 Log.d(TAG, "not bound yet");
 
                 Intent serviceIntent = new Intent();
-                serviceIntent.setAction("com.android.crypto.ICryptoService");
+                serviceIntent.setAction("org.openintents.crypto.ICryptoService");
                 serviceIntent.setPackage(cryptoProviderPackageName); // TODO: test
                 mApplicationContext.bindService(serviceIntent, mCryptoServiceConnection,
                         Context.BIND_AUTO_CREATE);
diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.aidl b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.aidl
similarity index 96%
rename from OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.aidl
rename to OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.aidl
index 21862c497..1d39bac70 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.aidl
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package com.android.crypto;
+package org.openintents.crypto;
 
 // Declare CryptoSignatureResult so AIDL can find it and knows that it implements the parcelable protocol.
 parcelable CryptoSignatureResult;
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.java b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.java
similarity index 98%
rename from OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.java
rename to OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.java
index 87f5f43b5..e193b73b3 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/CryptoSignatureResult.java
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/CryptoSignatureResult.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.crypto;
+package org.openintents.crypto;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/OpenPGP-Keychain/src/com/android/crypto/ICryptoCallback.aidl b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl
similarity index 83%
rename from OpenPGP-Keychain/src/com/android/crypto/ICryptoCallback.aidl
rename to OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl
index af6587c04..80c741a9e 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/ICryptoCallback.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoCallback.aidl
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.crypto;
+package org.openintents.crypto;
 
-import com.android.crypto.CryptoSignatureResult;
-import com.android.crypto.CryptoError;
+import org.openintents.crypto.CryptoSignatureResult;
+import org.openintents.crypto.CryptoError;
 
 interface ICryptoCallback {
 
@@ -27,6 +27,4 @@ interface ICryptoCallback {
 
 
     oneway void onError(in CryptoError error);
-    
-    oneway void onActivityRequired(in Intent intent);
 }
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl
similarity index 96%
rename from OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl
rename to OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl
index 0f295d183..04c8eb30e 100644
--- a/OpenPGP-Keychain/src/com/android/crypto/ICryptoService.aidl
+++ b/OpenPGP-Keychain/src/org/openintents/crypto/ICryptoService.aidl
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package com.android.crypto;
+package org.openintents.crypto;
 
-import com.android.crypto.ICryptoCallback;
+import org.openintents.crypto.ICryptoCallback;
 
 /**
  * All methods are oneway, which means they are asynchronous and non-blocking.
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
index 1a57a457d..a367c613f 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
@@ -20,6 +20,9 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+
+import org.openintents.crypto.CryptoError;
+import org.openintents.crypto.CryptoSignatureResult;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.helper.PgpMain;
@@ -29,10 +32,8 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.PassphraseCacheService;
 
-import com.android.crypto.CryptoError;
-import com.android.crypto.ICryptoCallback;
-import com.android.crypto.ICryptoService;
-import com.android.crypto.CryptoSignatureResult;
+import org.openintents.crypto.ICryptoCallback;
+import org.openintents.crypto.ICryptoService;
 
 import android.app.Service;
 import android.content.Context;
@@ -89,7 +90,8 @@ public class CryptoService extends Service {
                 // passphrase!
                 Intent intent = new Intent(CryptoActivity.ACTION_CACHE_PASSPHRASE);
                 intent.putExtra(CryptoActivity.EXTRA_SECRET_KEY_ID, secretKeyId);
-                callback.onActivityRequired(intent);
+                // TODO: start activity bind to service from activity send back intent on success
+//                callback.onActivityRequired(intent);
                 return;
             }