diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 85ba551..9fad6dd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,11 +3,7 @@
     package="net.named_data.nfd" >
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_LOGS" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
 
     <application
         android:allowBackup="true"
@@ -30,13 +26,13 @@
         </activity>
 
         <service
-            android:name=".NfdService"
-            android:process="net.named_data.nfd.NfdService"
+            android:name=".service.NfdService"
+            android:process="net.named_data.nfd.service.NfdService"
             android:icon="@drawable/ic_launcher"
             android:label="@string/service_name"
             android:exported="true" >
             <intent-filter>
-                <action android:name="net.named_data.nfd.NfdService" />
+                <action android:name="net.named_data.nfd.START_NFD_SERVICE" />
             </intent-filter>
         </service>