diff --git a/android/build-commissioner-libs.sh b/android/build-commissioner-libs.sh
index 1054904d8..ed9c40e95 100755
--- a/android/build-commissioner-libs.sh
+++ b/android/build-commissioner-libs.sh
@@ -77,7 +77,7 @@ cd ../../../
 ## Copy shared native libraries
 cp "$BUILD_DIR"/src/java/libcommissioner-java.so "$BUILD_DIR"/libs
 
-mkdir -p openthread_commissioner/service/libs
-mkdir -p openthread_commissioner/service/src/main/jniLibs/"${ANDROID_ABI}"
-cp "$BUILD_DIR"/libs/libotcommissioner.jar openthread_commissioner/service/libs
-cp "$BUILD_DIR"/libs/*.so openthread_commissioner/service/src/main/jniLibs/"${ANDROID_ABI}"
+mkdir -p openthread_commissioner/app/libs
+mkdir -p openthread_commissioner/app/src/main/jniLibs/"${ANDROID_ABI}"
+cp "$BUILD_DIR"/libs/libotcommissioner.jar openthread_commissioner/app/libs
+cp "$BUILD_DIR"/libs/*.so openthread_commissioner/app/src/main/jniLibs/"${ANDROID_ABI}"
diff --git a/android/openthread_commissioner/.gitignore b/android/openthread_commissioner/.gitignore
index aa724b770..f4aeed1df 100644
--- a/android/openthread_commissioner/.gitignore
+++ b/android/openthread_commissioner/.gitignore
@@ -8,8 +8,10 @@
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 .DS_Store
-/build
+build/
 /captures
 .externalNativeBuild
 .cxx
 local.properties
+*.jar
+*.so
diff --git a/android/openthread_commissioner/app/.gitignore b/android/openthread_commissioner/app/.gitignore
deleted file mode 100644
index 796b96d1c..000000000
--- a/android/openthread_commissioner/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/android/openthread_commissioner/app/build.gradle b/android/openthread_commissioner/app/build.gradle
index 45b4ad1f8..6aa612ab2 100644
--- a/android/openthread_commissioner/app/build.gradle
+++ b/android/openthread_commissioner/app/build.gradle
@@ -78,6 +78,11 @@ android {
     }
 }
 
+// This is for the local tests (src/test) to find the native libraries.
+tasks.withType(Test) {
+    systemProperty "java.library.path", "/usr/local/lib"
+}
+
 configurations.all {
     resolutionStrategy {
         force 'androidx.test:core:1.5.0'
@@ -85,12 +90,22 @@ configurations.all {
 }
 
 dependencies {
-    implementation project(':service')
+    implementation 'org.jetbrains:annotations:15.0'
+    def room_version = "2.2.5"
+    implementation "androidx.room:room-runtime:$room_version"
+    annotationProcessor "androidx.room:room-compiler:$room_version"
+
+    implementation fileTree(dir: "libs", include: ["*.jar"])
 
+    implementation 'com.google.guava:guava:31.1-jre'
     implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation "androidx.concurrent:concurrent-futures:1.1.0"
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
+    implementation 'androidx.navigation:navigation-fragment:2.3.0'
+    implementation 'com.google.android.gms:play-services-vision:20.1.3+'
+    implementation 'com.google.android.gms:play-services-threadnetwork:16.0.0'
     implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
-    testImplementation 'junit:junit:4.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'com.google.truth:truth:1.4.4'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
 }
diff --git a/android/openthread_commissioner/service/src/androidTest/java/io/openthread/commissioner/ActiveOperationalDatasetTest.java b/android/openthread_commissioner/app/src/androidTest/java/io/openthread/commissioner/ActiveOperationalDatasetTest.java
similarity index 100%
rename from android/openthread_commissioner/service/src/androidTest/java/io/openthread/commissioner/ActiveOperationalDatasetTest.java
rename to android/openthread_commissioner/app/src/androidTest/java/io/openthread/commissioner/ActiveOperationalDatasetTest.java
diff --git a/android/openthread_commissioner/app/src/main/AndroidManifest.xml b/android/openthread_commissioner/app/src/main/AndroidManifest.xml
index b9beb9581..7430cd07b 100644
--- a/android/openthread_commissioner/app/src/main/AndroidManifest.xml
+++ b/android/openthread_commissioner/app/src/main/AndroidManifest.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <uses-feature
+      android:name="android.hardware.camera"
+      android:required="false" />
+
+  <uses-permission android:name="android.permission.CAMERA" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+  <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
   <application
       android:allowBackup="true"
       android:icon="@drawable/ic_launcher"
@@ -14,7 +24,6 @@
         android:exported="true" >
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
-
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
     </activity>
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/BorderAgentDiscoverer.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/BorderAgentDiscoverer.java
similarity index 99%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/BorderAgentDiscoverer.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/BorderAgentDiscoverer.java
index 6e4214d12..38c1eca3c 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/BorderAgentDiscoverer.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/BorderAgentDiscoverer.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import android.Manifest.permission;
 import android.content.Context;
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/BorderAgentInfo.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/BorderAgentInfo.java
similarity index 95%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/BorderAgentInfo.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/BorderAgentInfo.java
index 0a9babede..a916be670 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/BorderAgentInfo.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/BorderAgentInfo.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -48,9 +48,9 @@ public BorderAgentInfo(
       @NonNull byte[] extendedPanId,
       @NonNull InetAddress host,
       @NonNull int port) {
-    this.id = id.clone();
+    this.id = id == null ? null : id.clone();
     this.networkName = networkName;
-    this.extendedPanId = extendedPanId.clone();
+    this.extendedPanId = extendedPanId == null ? null : extendedPanId.clone();
     this.host = host;
     this.port = port;
   }
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/CameraSourceView.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/CameraSourceView.java
similarity index 99%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/CameraSourceView.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/CameraSourceView.java
index 7ca189bf8..3b2b30502 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/CameraSourceView.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/CameraSourceView.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import android.Manifest;
 import android.content.Context;
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/CommissionerUtils.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/CommissionerUtils.java
similarity index 98%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/CommissionerUtils.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/CommissionerUtils.java
index b31748886..952e18d3f 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/CommissionerUtils.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/CommissionerUtils.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import androidx.annotation.Nullable;
 import androidx.concurrent.futures.CallbackToFutureAdapter;
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/Constants.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/Constants.java
similarity index 97%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/Constants.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/Constants.java
index 92255dfcd..01958487c 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/Constants.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/Constants.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 public class Constants {
   public static final String KEY_DEVICE_INFO = "deviceinfo";
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/FetchCredentialDialogFragment.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/FetchCredentialDialogFragment.java
similarity index 99%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/FetchCredentialDialogFragment.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/FetchCredentialDialogFragment.java
index 7331e61b3..65b87f8ee 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/FetchCredentialDialogFragment.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/FetchCredentialDialogFragment.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/FragmentCallback.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/FragmentCallback.java
similarity index 97%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/FragmentCallback.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/FragmentCallback.java
index 98aeeb2f4..e147a07dd 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/FragmentCallback.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/FragmentCallback.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import androidx.annotation.Nullable;
 
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/InputNetworkPasswordDialogFragment.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/InputNetworkPasswordDialogFragment.java
similarity index 98%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/InputNetworkPasswordDialogFragment.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/InputNetworkPasswordDialogFragment.java
index 8e966ad08..104261c18 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/InputNetworkPasswordDialogFragment.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/InputNetworkPasswordDialogFragment.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/JoinerDeviceInfo.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/JoinerDeviceInfo.java
similarity index 98%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/JoinerDeviceInfo.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/JoinerDeviceInfo.java
index aacdc2a61..bea6807f5 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/JoinerDeviceInfo.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/JoinerDeviceInfo.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/MainActivity.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/MainActivity.java
index 22df9feca..31ae188c4 100644
--- a/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/MainActivity.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/MainActivity.java
@@ -40,12 +40,6 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
-import io.openthread.commissioner.service.FragmentCallback;
-import io.openthread.commissioner.service.JoinerDeviceInfo;
-import io.openthread.commissioner.service.MeshcopFragment;
-import io.openthread.commissioner.service.ScanQrCodeFragment;
-import io.openthread.commissioner.service.SelectNetworkFragment;
-import io.openthread.commissioner.service.ThreadNetworkInfoHolder;
 
 public class MainActivity extends AppCompatActivity implements FragmentCallback {
 
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/MeshcopFragment.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/MeshcopFragment.java
similarity index 98%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/MeshcopFragment.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/MeshcopFragment.java
index 2ba0eb6ab..cafa26cb0 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/MeshcopFragment.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/MeshcopFragment.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -67,7 +67,7 @@ public class MeshcopFragment extends Fragment
   @NonNull private final JoinerDeviceInfo joinerDeviceInfo;
 
   private final ThreadCommissionerServiceImpl commissionerService =
-      ThreadCommissionerServiceImpl.newInstance(this);
+      ThreadCommissionerServiceImpl.newInstance(getActivity(), this);
   private ListenableFuture<Void> commissionFuture;
 
   public MeshcopFragment(
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/NativeCommissionerLogger.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/NativeCommissionerLogger.java
similarity index 97%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/NativeCommissionerLogger.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/NativeCommissionerLogger.java
index 06031e54e..60afa57fc 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/NativeCommissionerLogger.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/NativeCommissionerLogger.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import android.util.Log;
 import io.openthread.commissioner.LogLevel;
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/NetworkAdapter.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/NetworkAdapter.java
similarity index 92%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/NetworkAdapter.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/NetworkAdapter.java
index ebb259621..24ef05598 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/NetworkAdapter.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/NetworkAdapter.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import android.content.Context;
 import android.os.Handler;
@@ -36,7 +36,7 @@
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
-import io.openthread.commissioner.service.BorderAgentDiscoverer.BorderAgentListener;
+import io.openthread.commissioner.app.BorderAgentDiscoverer.BorderAgentListener;
 import java.util.Arrays;
 import java.util.Vector;
 
@@ -66,7 +66,7 @@ public void addBorderAgent(BorderAgentInfo borderAgent) {
       networks.add(new ThreadNetworkInfoHolder(borderAgent));
     }
 
-    new Handler(Looper.getMainLooper()).post(() -> notifyDataSetChanged());
+    notifyDataSetChanged();
   }
 
   public void removeBorderAgent(byte[] lostBorderAgentId) {
@@ -78,7 +78,7 @@ public void removeBorderAgent(byte[] lostBorderAgentId) {
             networks.remove(networkInfoHolder);
           }
 
-          new Handler(Looper.getMainLooper()).post(() -> notifyDataSetChanged());
+          notifyDataSetChanged();
           return;
         }
       }
@@ -116,11 +116,11 @@ public View getView(int position, View convertView, ViewGroup container) {
 
   @Override
   public void onBorderAgentFound(BorderAgentInfo borderAgentInfo) {
-    addBorderAgent(borderAgentInfo);
+    new Handler(Looper.getMainLooper()).post(() -> addBorderAgent(borderAgentInfo));
   }
 
   @Override
   public void onBorderAgentLost(byte[] borderAgentId) {
-    removeBorderAgent(borderAgentId);
+    new Handler(Looper.getMainLooper()).post(() -> removeBorderAgent(borderAgentId));
   }
 }
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ScanQrCodeFragment.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ScanQrCodeFragment.java
similarity index 99%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ScanQrCodeFragment.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ScanQrCodeFragment.java
index 229a6003d..9ce610d58 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ScanQrCodeFragment.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ScanQrCodeFragment.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import android.Manifest;
 import android.app.AlertDialog;
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/SelectNetworkFragment.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/SelectNetworkFragment.java
similarity index 98%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/SelectNetworkFragment.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/SelectNetworkFragment.java
index c34ede3a4..0a3de0027 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/SelectNetworkFragment.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/SelectNetworkFragment.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -207,7 +207,8 @@ public void onClick(View view) {
     }
 
     ThreadCommissionerServiceImpl commissionerService =
-        ThreadCommissionerServiceImpl.newInstance(null);
+        ThreadCommissionerServiceImpl.newInstance(
+            getActivity(), /* intermediateStateCallback= */ null);
 
     FluentFuture.from(commissionerService.getThreadNetworkCredentials(selectedBorderAgent))
         .addCallback(
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ThreadCommissionerException.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ThreadCommissionerException.java
similarity index 98%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ThreadCommissionerException.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ThreadCommissionerException.java
index 2d8512b23..acec43adf 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ThreadCommissionerException.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ThreadCommissionerException.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import androidx.annotation.NonNull;
 import io.openthread.commissioner.ErrorCode;
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ThreadCommissionerService.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ThreadCommissionerService.java
similarity index 98%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ThreadCommissionerService.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ThreadCommissionerService.java
index 87add5fca..25c233a18 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ThreadCommissionerService.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ThreadCommissionerService.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import androidx.annotation.NonNull;
 import com.google.android.gms.threadnetwork.ThreadNetworkCredentials;
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ThreadCommissionerServiceImpl.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ThreadCommissionerServiceImpl.java
similarity index 98%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ThreadCommissionerServiceImpl.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ThreadCommissionerServiceImpl.java
index e2490118e..0db8ebee6 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ThreadCommissionerServiceImpl.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ThreadCommissionerServiceImpl.java
@@ -26,8 +26,9 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
+import android.content.Context;
 import android.os.ConditionVariable;
 import android.util.Log;
 import androidx.annotation.NonNull;
@@ -77,9 +78,9 @@ public interface IntermediateStateCallback {
   private ConditionVariable curJoinerCommissioned = new ConditionVariable();
 
   public static ThreadCommissionerServiceImpl newInstance(
-      @Nullable IntermediateStateCallback intermediateStateCallback) {
+      Context context, @Nullable IntermediateStateCallback intermediateStateCallback) {
     return new ThreadCommissionerServiceImpl(
-        ThreadNetwork.getClient(CommissionerServiceApp.getContext()),
+        ThreadNetwork.getClient(context),
         Executors.newSingleThreadExecutor(),
         intermediateStateCallback);
   }
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ThreadNetworkInfo.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ThreadNetworkInfo.java
similarity index 98%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ThreadNetworkInfo.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ThreadNetworkInfo.java
index 87b6b4036..6afed98df 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ThreadNetworkInfo.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ThreadNetworkInfo.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ThreadNetworkInfoHolder.java b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ThreadNetworkInfoHolder.java
similarity index 98%
rename from android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ThreadNetworkInfoHolder.java
rename to android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ThreadNetworkInfoHolder.java
index 9aa068437..59b27fc32 100644
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/ThreadNetworkInfoHolder.java
+++ b/android/openthread_commissioner/app/src/main/java/io/openthread/commissioner/app/ThreadNetworkInfoHolder.java
@@ -26,7 +26,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.openthread.commissioner.service;
+package io.openthread.commissioner.app;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/android/openthread_commissioner/service/src/main/res/drawable/ic_done_icon.xml b/android/openthread_commissioner/app/src/main/res/drawable/ic_done_icon.xml
similarity index 100%
rename from android/openthread_commissioner/service/src/main/res/drawable/ic_done_icon.xml
rename to android/openthread_commissioner/app/src/main/res/drawable/ic_done_icon.xml
diff --git a/android/openthread_commissioner/service/src/main/res/drawable/ic_error_icon.xml b/android/openthread_commissioner/app/src/main/res/drawable/ic_error_icon.xml
similarity index 100%
rename from android/openthread_commissioner/service/src/main/res/drawable/ic_error_icon.xml
rename to android/openthread_commissioner/app/src/main/res/drawable/ic_error_icon.xml
diff --git a/android/openthread_commissioner/service/src/main/res/drawable/ic_network_selected_icon.xml b/android/openthread_commissioner/app/src/main/res/drawable/ic_network_selected_icon.xml
similarity index 100%
rename from android/openthread_commissioner/service/src/main/res/drawable/ic_network_selected_icon.xml
rename to android/openthread_commissioner/app/src/main/res/drawable/ic_network_selected_icon.xml
diff --git a/android/openthread_commissioner/service/src/main/res/drawable/ic_wireless_network_icon.xml b/android/openthread_commissioner/app/src/main/res/drawable/ic_wireless_network_icon.xml
similarity index 100%
rename from android/openthread_commissioner/service/src/main/res/drawable/ic_wireless_network_icon.xml
rename to android/openthread_commissioner/app/src/main/res/drawable/ic_wireless_network_icon.xml
diff --git a/android/openthread_commissioner/service/src/main/res/layout/activity_commissioner.xml b/android/openthread_commissioner/app/src/main/res/layout/activity_commissioner.xml
similarity index 100%
rename from android/openthread_commissioner/service/src/main/res/layout/activity_commissioner.xml
rename to android/openthread_commissioner/app/src/main/res/layout/activity_commissioner.xml
diff --git a/android/openthread_commissioner/service/src/main/res/layout/fragment_fetch_credential_dialog.xml b/android/openthread_commissioner/app/src/main/res/layout/fragment_fetch_credential_dialog.xml
similarity index 100%
rename from android/openthread_commissioner/service/src/main/res/layout/fragment_fetch_credential_dialog.xml
rename to android/openthread_commissioner/app/src/main/res/layout/fragment_fetch_credential_dialog.xml
diff --git a/android/openthread_commissioner/service/src/main/res/layout/fragment_meshcop.xml b/android/openthread_commissioner/app/src/main/res/layout/fragment_meshcop.xml
similarity index 97%
rename from android/openthread_commissioner/service/src/main/res/layout/fragment_meshcop.xml
rename to android/openthread_commissioner/app/src/main/res/layout/fragment_meshcop.xml
index d2f55e18f..15f21dc97 100644
--- a/android/openthread_commissioner/service/src/main/res/layout/fragment_meshcop.xml
+++ b/android/openthread_commissioner/app/src/main/res/layout/fragment_meshcop.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="io.openthread.commissioner.service.CommissionerActivity">
+    tools:context=".MainActivity">
 
   <ProgressBar
       android:id="@+id/commissioning_progress"
diff --git a/android/openthread_commissioner/service/src/main/res/layout/fragment_network_password_dialog.xml b/android/openthread_commissioner/app/src/main/res/layout/fragment_network_password_dialog.xml
similarity index 100%
rename from android/openthread_commissioner/service/src/main/res/layout/fragment_network_password_dialog.xml
rename to android/openthread_commissioner/app/src/main/res/layout/fragment_network_password_dialog.xml
diff --git a/android/openthread_commissioner/service/src/main/res/layout/fragment_scan_qrcode.xml b/android/openthread_commissioner/app/src/main/res/layout/fragment_scan_qrcode.xml
similarity index 91%
rename from android/openthread_commissioner/service/src/main/res/layout/fragment_scan_qrcode.xml
rename to android/openthread_commissioner/app/src/main/res/layout/fragment_scan_qrcode.xml
index e6c368fe7..4e168ea27 100644
--- a/android/openthread_commissioner/service/src/main/res/layout/fragment_scan_qrcode.xml
+++ b/android/openthread_commissioner/app/src/main/res/layout/fragment_scan_qrcode.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="io.openthread.commissioner.service.CommissionerActivity">
+    tools:context=".MainActivity">
 
   <TextView
       android:id="@+id/title_text"
@@ -16,7 +16,7 @@
       app:layout_constraintLeft_toLeftOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
 
-  <io.openthread.commissioner.service.CameraSourceView
+  <io.openthread.commissioner.app.CameraSourceView
       android:id="@+id/camera_view"
       android:layout_width="0dp"
       android:layout_height="0dp"
@@ -26,7 +26,7 @@
       app:layout_constraintBottom_toTopOf="@+id/scan_instruction_text"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/title_text"></io.openthread.commissioner.service.CameraSourceView>
+      app:layout_constraintTop_toBottomOf="@id/title_text"></io.openthread.commissioner.app.CameraSourceView>
   <Button
       android:id="@+id/cancel_button"
       android:layout_width="wrap_content"
diff --git a/android/openthread_commissioner/service/src/main/res/layout/fragment_select_network.xml b/android/openthread_commissioner/app/src/main/res/layout/fragment_select_network.xml
similarity index 100%
rename from android/openthread_commissioner/service/src/main/res/layout/fragment_select_network.xml
rename to android/openthread_commissioner/app/src/main/res/layout/fragment_select_network.xml
diff --git a/android/openthread_commissioner/service/src/main/res/layout/network_list_item.xml b/android/openthread_commissioner/app/src/main/res/layout/network_list_item.xml
similarity index 100%
rename from android/openthread_commissioner/service/src/main/res/layout/network_list_item.xml
rename to android/openthread_commissioner/app/src/main/res/layout/network_list_item.xml
diff --git a/android/openthread_commissioner/app/src/main/res/values/colors.xml b/android/openthread_commissioner/app/src/main/res/values/colors.xml
index 758655a2e..3ffec3e1c 100644
--- a/android/openthread_commissioner/app/src/main/res/values/colors.xml
+++ b/android/openthread_commissioner/app/src/main/res/values/colors.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <color name="colorPrimary">#6200EE</color>
+  <color name="colorPrimaryDark">#3700B3</color>
+  <color name="colorAccent">#03DAC5</color>
   <color name="purple_200">#FFBB86FC</color>
   <color name="purple_500">#FF6200EE</color>
   <color name="purple_700">#FF3700B3</color>
diff --git a/android/openthread_commissioner/app/src/main/res/values/strings.xml b/android/openthread_commissioner/app/src/main/res/values/strings.xml
index 1e0341e7e..85d105aeb 100644
--- a/android/openthread_commissioner/app/src/main/res/values/strings.xml
+++ b/android/openthread_commissioner/app/src/main/res/values/strings.xml
@@ -2,4 +2,24 @@
   <string name="app_name">OpenThread Commissioner</string>
   <string name="action_settings">Settings</string>
   <string name="commission_new_device">Commission New Device</string>
+  <string name="commissioning">Commissioning</string>
+  <string name="commissioner">Commissioner</string>
+  <string name="scan_device">Scan Device</string>
+  <string name="cancel">Cancel</string>
+  <string name="done">Done</string>
+  <string name="scan_instruction">Please scan the QR code on the device</string>
+  <string name="your_device">Your Device</string>
+  <string name="select_network">Select Network</string>
+  <string name="add_device">Add Device</string>
+  <string name="scan_qrcode_fragment_label">Scan QR Code</string>
+  <string name="select_network_fragment_label">Select Network</string>
+  <string name="password">password</string>
+  <string name="password_connect">connect</string>
+  <string name="password_cancel">cancel</string>
+  <string name="fetch_credential_done">done</string>
+  <string name="fetch_credential_cancel">cancel</string>
+  <string name="commissioning_fragment_label">Commissioning</string>
+  <string name="location_permission_missing_alert_title">Location permission missing</string>
+  <string name="location_permission_missing_alert_message">Location permission is required to scan BLE devices.</string>
+  <string name="location_permission_missing_alert_try_again">Try again</string>
 </resources>
diff --git a/android/openthread_commissioner/service/src/main/res/values/styles.xml b/android/openthread_commissioner/app/src/main/res/values/styles.xml
similarity index 100%
rename from android/openthread_commissioner/service/src/main/res/values/styles.xml
rename to android/openthread_commissioner/app/src/main/res/values/styles.xml
diff --git a/android/openthread_commissioner/service/.gitignore b/android/openthread_commissioner/service/.gitignore
deleted file mode 100644
index 3d60c9d3b..000000000
--- a/android/openthread_commissioner/service/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/build
-*.jar
-*.so
diff --git a/android/openthread_commissioner/service/build.gradle b/android/openthread_commissioner/service/build.gradle
deleted file mode 100644
index a210787cc..000000000
--- a/android/openthread_commissioner/service/build.gradle
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *    Copyright (c) 2020, The OpenThread Commissioner Authors.
- *    All rights reserved.
- *
- *    Redistribution and use in source and binary forms, with or without
- *    modification, are permitted provided that the following conditions are met:
- *    1. Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *    2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *    3. Neither the name of the copyright holder nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- *    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- *    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *    POSSIBILITY OF SUCH DAMAGE.
- */
-
-plugins {
-    id 'com.android.library'
-}
-
-android {
-    compileSdkVersion 34
-
-    defaultConfig {
-        minSdkVersion 26
-        targetSdkVersion 34
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    namespace 'io.openthread.commissioner.service'
-}
-
-// This is for the local tests (src/test) to find the native libraries.
-tasks.withType(Test) {
-    systemProperty "java.library.path", "/usr/local/lib"
-}
-
-configurations.all {
-    resolutionStrategy {
-        force 'androidx.test:core:1.5.0'
-    }
-}
-
-dependencies {
-    implementation 'org.jetbrains:annotations:15.0'
-    def room_version = "2.2.5"
-    implementation "androidx.room:room-runtime:$room_version"
-    annotationProcessor "androidx.room:room-compiler:$room_version"
-
-    implementation fileTree(dir: "libs", include: ["*.jar"])
-
-    implementation 'com.google.guava:guava:31.1-jre'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.concurrent:concurrent-futures:1.1.0"
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
-    implementation 'androidx.navigation:navigation-fragment:2.3.0'
-    implementation 'com.google.android.gms:play-services-vision:20.1.3+'
-    implementation 'com.google.android.gms:play-services-threadnetwork:16.0.0'
-    implementation 'com.google.android.material:material:1.2.1'
-    androidTestImplementation 'com.google.truth:truth:1.4.4'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
-}
diff --git a/android/openthread_commissioner/service/consumer-rules.pro b/android/openthread_commissioner/service/consumer-rules.pro
deleted file mode 100644
index e69de29bb..000000000
diff --git a/android/openthread_commissioner/service/proguard-rules.pro b/android/openthread_commissioner/service/proguard-rules.pro
deleted file mode 100644
index f1b424510..000000000
--- a/android/openthread_commissioner/service/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/android/openthread_commissioner/service/src/main/AndroidManifest.xml b/android/openthread_commissioner/service/src/main/AndroidManifest.xml
deleted file mode 100644
index dda2e3fc0..000000000
--- a/android/openthread_commissioner/service/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-  <uses-permission android:name="android.permission.CAMERA" />
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-  <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-
-  <application android:name="io.openthread.commissioner.service.CommissionerServiceApp">
-    <activity android:name="io.openthread.commissioner.service.CommissionerActivity"
-        android:exported="true" >
-      <intent-filter>
-        <action android:name="io.openthread.commissioner.action.COMMISSION_DEVICE"/>
-        <action android:name="io.openthread.commissioner.action.FETCH_CREDENTIAL"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-      </intent-filter>
-    </activity>
-  </application>
-</manifest>
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/CommissionerActivity.java b/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/CommissionerActivity.java
deleted file mode 100644
index 06c7ce62f..000000000
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/CommissionerActivity.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *    Copyright (c) 2020, The OpenThread Commissioner Authors.
- *    All rights reserved.
- *
- *    Redistribution and use in source and binary forms, with or without
- *    modification, are permitted provided that the following conditions are met:
- *    1. Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *    2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *    3. Neither the name of the copyright holder nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- *    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- *    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *    POSSIBILITY OF SUCH DAMAGE.
- */
-
-package io.openthread.commissioner.service;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.Fragment;
-
-public class CommissionerActivity extends AppCompatActivity implements FragmentCallback {
-  private static final String TAG = CommissionerActivity.class.getSimpleName();
-
-  public static final String ACTION_COMMISSION_DEVICE =
-      "io.openthread.commissioner.action.COMMISSION_DEVICE";
-  public static final String ACTION_FETCH_CREDENTIAL =
-      "io.openthread.commissioner.action.FETCH_CREDENTIAL";
-
-  public static final String KEY_JOINER_DISCERNER = "JOINER_DISCERNER";
-  public static final String KEY_JOINER_DISCERNER_BIT_LENGTH = "JOINER_DISCERNER_BIT_LENGTH";
-  public static final String KEY_JOINER_EUI64 = "JOINER_EUI64";
-  public static final String KEY_JOINER_PSKD = "JOINER_PSKD";
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_commissioner);
-
-    Intent intent = getIntent();
-    if (intent == null) {
-      Log.e(TAG, "no intent provided");
-      finishCommissioning(Activity.RESULT_CANCELED);
-    } else if (ACTION_COMMISSION_DEVICE.equals(intent.getAction())) {
-      JoinerDeviceInfo joinerDeviceInfo = getJoinerDevice(intent);
-      if (joinerDeviceInfo == null) {
-        // TODO(wgtdkp): scan QR code of the joiner device.
-        showFragment(new ScanQrCodeFragment(this));
-      } else {
-        showFragment(new SelectNetworkFragment(this, joinerDeviceInfo));
-      }
-    } else if (ACTION_FETCH_CREDENTIAL.equals(intent.getAction())) {
-      // TODO(wgtdkp):
-      //  0. Ask confirmation from the user of granting access of
-      //  the Thread Network Credential to the requesting App.
-      //  1. Query network credential from local database.
-      //  2. Fetch network credential from given network when querying
-      //     the database failed.
-    } else {
-      assert (false);
-    }
-  }
-
-  private JoinerDeviceInfo getJoinerDevice(Intent intent) {
-    byte[] eui64 = intent.getByteArrayExtra(KEY_JOINER_EUI64);
-    String pskd = intent.getStringExtra(KEY_JOINER_PSKD);
-
-    if (eui64 == null) {
-      Log.i(TAG, "missing joiner discerner!");
-      return null;
-    } else if (pskd == null) {
-      Log.i(TAG, "missing joiner pskd!");
-      return null;
-    } else {
-      return new JoinerDeviceInfo(eui64, pskd);
-    }
-  }
-
-  public void finishCommissioning(int resultCode) {
-    Intent resultIntent = new Intent();
-    setResult(resultCode, resultIntent);
-    finish();
-  }
-
-  public void showFragment(Fragment fragment) {
-    getSupportFragmentManager()
-        .beginTransaction()
-        .replace(R.id.commissioner_service_activity, fragment, fragment.getClass().getSimpleName())
-        .addToBackStack(null)
-        .commit();
-  }
-
-  @Override
-  public void onJoinerInfoReceived(@Nullable JoinerDeviceInfo joinerDeviceInfo) {
-    showFragment(new SelectNetworkFragment(this, joinerDeviceInfo));
-  }
-
-  @Override
-  public void onNetworkSelected(
-      @NonNull ThreadNetworkInfoHolder networkInfoHolder, @NonNull byte[] pskc) {
-    // TODO(wgtdkp): goto commissioning fragment.
-  }
-
-  @Override
-  public void onMeshcopResult(int result) {
-    // TODO(wgtdkp):
-  }
-}
diff --git a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/CommissionerServiceApp.java b/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/CommissionerServiceApp.java
deleted file mode 100644
index 753ceffa7..000000000
--- a/android/openthread_commissioner/service/src/main/java/io/openthread/commissioner/service/CommissionerServiceApp.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *    Copyright (c) 2020, The OpenThread Commissioner Authors.
- *    All rights reserved.
- *
- *    Redistribution and use in source and binary forms, with or without
- *    modification, are permitted provided that the following conditions are met:
- *    1. Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *    2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *    3. Neither the name of the copyright holder nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- *    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- *    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- *    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- *    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *    POSSIBILITY OF SUCH DAMAGE.
- */
-
-package io.openthread.commissioner.service;
-
-import android.app.Application;
-import android.content.Context;
-
-/** The Commissioner Service App for getting Application Context from anywhere. */
-public class CommissionerServiceApp extends Application {
-  private static CommissionerServiceApp instance;
-
-  public static CommissionerServiceApp getInstance() {
-    return instance;
-  }
-
-  public static Context getContext() {
-    return instance.getApplicationContext();
-  }
-
-  @Override
-  public void onCreate() {
-    instance = this;
-    super.onCreate();
-  }
-}
diff --git a/android/openthread_commissioner/service/src/main/res/values/colors.xml b/android/openthread_commissioner/service/src/main/res/values/colors.xml
deleted file mode 100644
index 030098fe0..000000000
--- a/android/openthread_commissioner/service/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#6200EE</color>
-    <color name="colorPrimaryDark">#3700B3</color>
-    <color name="colorAccent">#03DAC5</color>
-</resources>
diff --git a/android/openthread_commissioner/service/src/main/res/values/strings.xml b/android/openthread_commissioner/service/src/main/res/values/strings.xml
deleted file mode 100644
index 8cc662a2b..000000000
--- a/android/openthread_commissioner/service/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<resources>
-    <string name="commissioning">Commissioning</string>
-    <string name="commissioner">Commissioner</string>
-    <string name="scan_device">Scan Device</string>
-    <string name="cancel">Cancel</string>
-    <string name="done">Done</string>
-    <string name="scan_instruction">Please scan the QR code on the device</string>
-    <string name="your_device">Your Device</string>
-    <string name="select_network">Select Network</string>
-    <string name="add_device">Add Device</string>
-    <string name="scan_qrcode_fragment_label">Scan QR Code</string>
-    <string name="select_network_fragment_label">Select Network</string>
-    <string name="password">password</string>
-    <string name="password_connect">connect</string>
-    <string name="password_cancel">cancel</string>
-    <string name="fetch_credential_done">done</string>
-    <string name="fetch_credential_cancel">cancel</string>
-    <string name="commissioning_fragment_label">Commissioning</string>
-    <string name="location_permission_missing_alert_title">Location permission missing</string>
-    <string name="location_permission_missing_alert_message">Location permission is required to scan BLE devices.</string>
-    <string name="location_permission_missing_alert_try_again">Try again</string>
-</resources>