diff --git a/app/src/main/java/org/kiwix/kiwixmobile/local_file_transfer/FileListAdapter.java b/app/src/main/java/org/kiwix/kiwixmobile/local_file_transfer/FileListAdapter.java
index 357487f95..fd21276ab 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/local_file_transfer/FileListAdapter.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/local_file_transfer/FileListAdapter.java
@@ -29,8 +29,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import java.util.ArrayList;
-import org.kiwix.kiwixmobile.core.R;
-import org.kiwix.kiwixmobile.core.R2;
+import org.kiwix.kiwixmobile.R;
 
 import static org.kiwix.kiwixmobile.local_file_transfer.FileItem.FileStatus.ERROR;
 import static org.kiwix.kiwixmobile.local_file_transfer.FileItem.FileStatus.SENDING;
@@ -95,9 +94,9 @@ public class FileListAdapter extends RecyclerView.Adapter<FileListAdapter.FileVi
   }
 
   class FileViewHolder extends RecyclerView.ViewHolder {
-    @BindView(R2.id.text_view_file_item_name) TextView fileName;
-    @BindView(R2.id.image_view_file_transferred) ImageView statusImage;
-    @BindView(R2.id.progress_bar_transferring_file) ProgressBar progressBar;
+    @BindView(R.id.text_view_file_item_name) TextView fileName;
+    @BindView(R.id.image_view_file_transferred) ImageView statusImage;
+    @BindView(R.id.progress_bar_transferring_file) ProgressBar progressBar;
     final FileListAdapter fileListAdapter;
 
     public FileViewHolder(View itemView, FileListAdapter fileListAdapter) {
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/local_file_transfer/LocalFileTransferActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/local_file_transfer/LocalFileTransferActivity.java
index 412f62316..b5190d239 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/local_file_transfer/LocalFileTransferActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/local_file_transfer/LocalFileTransferActivity.java
@@ -46,7 +46,6 @@ import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnItemClick;
 import java.util.ArrayList;
 import java.util.List;
@@ -54,12 +53,10 @@ import javax.inject.Inject;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import org.kiwix.kiwixmobile.ActivityExtensionsKt;
-import org.kiwix.kiwixmobile.core.R;
-import org.kiwix.kiwixmobile.core.R2;
+import org.kiwix.kiwixmobile.R;
 import org.kiwix.kiwixmobile.core.base.BaseActivity;
 import org.kiwix.kiwixmobile.core.utils.AlertDialogShower;
 import org.kiwix.kiwixmobile.core.utils.KiwixDialog;
-import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil;
 
 /**
  * Created by @Aditya-Sood as a part of GSoC 2019.
@@ -84,17 +81,16 @@ public class LocalFileTransferActivity extends BaseActivity implements
   private static final int PERMISSION_REQUEST_CODE_COARSE_LOCATION = 1;
   private static final int PERMISSION_REQUEST_CODE_STORAGE_WRITE_ACCESS = 2;
 
-  @Inject SharedPreferenceUtil sharedPreferenceUtil;
   @Inject AlertDialogShower alertDialogShower;
   @Inject WifiDirectManager wifiDirectManager;
   @Inject LocationManager locationManager;
 
-  @BindView(R2.id.toolbar_local_file_transfer) Toolbar actionBar;
-  @BindView(R2.id.text_view_device_name) TextView deviceName;
-  @BindView(R2.id.progress_bar_searching_peers) ProgressBar searchingPeersProgressBar;
-  @BindView(R2.id.list_peer_devices) ListView listViewPeerDevices;
-  @BindView(R2.id.text_view_empty_peer_list) TextView textViewPeerDevices;
-  @BindView(R2.id.recycler_view_transfer_files) RecyclerView filesRecyclerView;
+  @BindView(R.id.toolbar_local_file_transfer) Toolbar actionBar;
+  @BindView(R.id.text_view_device_name) TextView deviceName;
+  @BindView(R.id.progress_bar_searching_peers) ProgressBar searchingPeersProgressBar;
+  @BindView(R.id.list_peer_devices) ListView listViewPeerDevices;
+  @BindView(R.id.text_view_empty_peer_list) TextView textViewPeerDevices;
+  @BindView(R.id.recycler_view_transfer_files) RecyclerView filesRecyclerView;
 
   private boolean isFileSender = false;    // Whether the device is the file sender or not
 
@@ -109,12 +105,8 @@ public class LocalFileTransferActivity extends BaseActivity implements
 
   @Override
   protected void onCreate(@Nullable Bundle savedInstanceState) {
-    setTheme(sharedPreferenceUtil.nightMode() ? R.style.Theme_AppCompat_DayNight_NoActionBar
-      : R.style.AppTheme);
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_local_file_transfer);
-    ButterKnife.bind(this);
-
     /*
      * Presence of file Uris decides whether the device with the activity open is a sender or receiver:
      * - On the sender device, this activity is started from the app chooser post selection
@@ -145,7 +137,7 @@ public class LocalFileTransferActivity extends BaseActivity implements
     wifiDirectManager.startWifiDirectManager(filesForTransfer);
   }
 
-  @OnItemClick(R2.id.list_peer_devices)
+  @OnItemClick(R.id.list_peer_devices)
   void onItemClick(int position) {
     WifiP2pDevice senderSelectedPeerDevice =
       (WifiP2pDevice) listViewPeerDevices.getAdapter().getItem(position);
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/local_file_transfer/WifiPeerListAdapter.java b/app/src/main/java/org/kiwix/kiwixmobile/local_file_transfer/WifiPeerListAdapter.java
index 01f2660b1..c43347081 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/local_file_transfer/WifiPeerListAdapter.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/local_file_transfer/WifiPeerListAdapter.java
@@ -32,8 +32,7 @@ import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import java.util.List;
-import org.kiwix.kiwixmobile.core.R;
-import org.kiwix.kiwixmobile.core.R2;
+import org.kiwix.kiwixmobile.R;
 
 /**
  * Helper class, part of the local file sharing module.
@@ -80,7 +79,7 @@ public class WifiPeerListAdapter extends ArrayAdapter<WifiP2pDevice> {
   }
 
   static class ViewHolder {
-    @BindView(R2.id.row_device_name) TextView deviceName;
+    @BindView(R.id.row_device_name) TextView deviceName;
 
     public ViewHolder(View view) {
       ButterKnife.bind(this, view);
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
index 821ddd829..f6ad7a216 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
@@ -19,7 +19,7 @@
 package org.kiwix.kiwixmobile.zim_manager.fileselect_view.effects
 
 import android.app.Activity
-import org.kiwix.kiwixmobile.core.R.string
+import org.kiwix.kiwixmobile.R
 import org.kiwix.kiwixmobile.core.base.BaseActivity
 import org.kiwix.kiwixmobile.core.dao.NewBookDao
 import org.kiwix.kiwixmobile.core.extensions.toast
@@ -46,9 +46,9 @@ class DeleteFiles(private val booksOnDiskListItem: List<BookOnDisk>) :
           if (it.file.canonicalPath == zimReaderContainer.zimCanonicalPath) {
             zimReaderContainer.setZimFile(null)
           }
-          activity.toast(string.delete_specific_zim_toast)
+          activity.toast(R.string.delete_specific_zim_toast)
         } else {
-          activity.toast(string.delete_zim_failed)
+          activity.toast(R.string.delete_zim_failed)
         }
       })
     }
diff --git a/core/src/main/res/layout/activity_local_file_transfer.xml b/app/src/main/res/layout/activity_local_file_transfer.xml
similarity index 100%
rename from core/src/main/res/layout/activity_local_file_transfer.xml
rename to app/src/main/res/layout/activity_local_file_transfer.xml
diff --git a/core/src/main/res/layout/item_transfer_list.xml b/app/src/main/res/layout/item_transfer_list.xml
similarity index 100%
rename from core/src/main/res/layout/item_transfer_list.xml
rename to app/src/main/res/layout/item_transfer_list.xml
diff --git a/core/src/main/res/layout/row_peer_device.xml b/app/src/main/res/layout/row_peer_device.xml
similarity index 100%
rename from core/src/main/res/layout/row_peer_device.xml
rename to app/src/main/res/layout/row_peer_device.xml