diff --git a/src/frontends/android/AndroidManifest.xml b/src/frontends/android/AndroidManifest.xml
index 79ebd663c..c6f4e14e4 100644
--- a/src/frontends/android/AndroidManifest.xml
+++ b/src/frontends/android/AndroidManifest.xml
@@ -5,6 +5,7 @@
     android:versionName="1.0" >
 
     <uses-sdk android:minSdkVersion="14" />
+
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
@@ -19,9 +20,12 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <service android:name=".CharonVpnService" android:permission="android.permission.BIND_VPN_SERVICE">
+        <service
+            android:name=".logic.CharonVpnService"
+            android:exported="false"
+            android:permission="android.permission.BIND_VPN_SERVICE" >
             <intent-filter>
-                <action android:name="android.net.VpnService"/>
+                <action android:name="org.strongswan.android.logic.CharonVpnService" />
             </intent-filter>
         </service>
     </application>
diff --git a/src/frontends/android/jni/libandroidbridge/android_jni.h b/src/frontends/android/jni/libandroidbridge/android_jni.h
index 2a8d3a71b..77c33f73e 100644
--- a/src/frontends/android/jni/libandroidbridge/android_jni.h
+++ b/src/frontends/android/jni/libandroidbridge/android_jni.h
@@ -25,8 +25,8 @@
 
 #include <jni.h>
 
-#define JNI_PACKAGE org_strongswan_android
-#define JNI_PACKAGE_STRING "org/strongswan/android"
+#define JNI_PACKAGE org_strongswan_android_logic
+#define JNI_PACKAGE_STRING "org/strongswan/android/logic"
 
 #define JNI_METHOD_PP(pack, klass, name, ret, ...) \
 	ret Java_##pack##_##klass##_##name(JNIEnv *env, jobject this, ##__VA_ARGS__)
diff --git a/src/frontends/android/src/org/strongswan/android/CharonVpnService.java b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
similarity index 96%
rename from src/frontends/android/src/org/strongswan/android/CharonVpnService.java
rename to src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
index d917d3eae..b32f9ae87 100644
--- a/src/frontends/android/src/org/strongswan/android/CharonVpnService.java
+++ b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
@@ -1,4 +1,4 @@
-package org.strongswan.android;
+package org.strongswan.android.logic;
 
 import android.content.Intent;
 import android.net.VpnService;