diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5833536..9d82d27 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,6 +14,11 @@ orbs:
 jobs:
   # Below is the definition of your job to build and test your app, you can rename and customize it as you want.
   build-and-test:
+    # Parameters used for determining
+    parameters:
+      flavour:
+        type: string
+        default: "Driver"
     # These next lines define the Android machine image executor.
     # See: https://circleci.com/docs/2.0/executor-types/
     executor:
@@ -29,14 +34,13 @@ jobs:
           name: Setup variables for build
           command: |
             echo "$GOOGLE_SERVICES_KEY" > "app/google-services.json"
-      #            echo "$RELEASE_KEYSTORE_BASE64" | base64 --decode > "android/app/release_keystore.jks"
       - run:
           name: Grant execute permission for gradlew
           command: |
             chmod +x gradlew
       # The next step will run the unit tests
       - android/run-tests:
-          test-command: ./gradlew testDriverDebugUnitTest --continue
+          test-command: ./gradlew test<< parameters.flavour >>DebugUnitTest --continue
       # Install Firebase tools needed for firebase emulator
       - run:
           name: Install firebase tools
@@ -50,15 +54,10 @@ jobs:
           background: true
       # Then start the emulator and run the Instrumentation tests!
       - android/start-emulator-and-run-tests:
-          post-emulator-launch-assemble-command: ./gradlew assembleDriverDebugAndroidTest
-          test-command: ./gradlew connectedDriverDebugAndroidTest
+          post-emulator-launch-assemble-command: ./gradlew assemble<< parameters.flavour >>DebugAndroidTest
+          test-command: ./gradlew connected<< parameters.flavour >>DebugAndroidTest
           system-image: system-images;android-25;google_apis;x86
-      # And finally run the release build
-#      - run:
-#          name: Assemble release build
-#          command: |
-#            ./gradlew assembleDriverRelease
-      # Then publish the artifacts of the Instrumentation tests!
+      # store test reports
       - store_artifacts:
           path: app/build/reports/androidTests/connected
           destination: reports
@@ -74,11 +73,50 @@ jobs:
       # Then publish the results of the Instrumentation tests!
       - store_test_results:
           path: app/build/outputs/androidTest-results/connected
-
+  # Assemble
+  assemble-and-release:
+    # Parameters used for determining
+    parameters:
+      flavour:
+        type: string
+        default: ""
+    executor:
+      name: android/android-machine
+    steps:
+      - run:
+          name: Setup variables for release
+          command: |
+            echo "$RELEASE_KEYSTORE_BASE64" | base64 --decode > "android/app/release_keystore.jks"
+            echo "$GOOGLE_PLAY_KEY" > "android/playstore.json"
+      # And finally run the release build
+      - run:
+          name: Assemble release build
+          command: |
+            ./gradlew assembleDriverRelease
 # Invoke jobs via workflows
 # See: https://circleci.com/docs/2.0/configuration-reference/#workflows
 workflows:
-  sample: # This is the name of the workflow, feel free to change it to better match your workflow.
-    # Inside the workflow, you define the jobs you want to run.
+  version: 2
+  build-release-driver:
     jobs:
-      - build-and-test
+      - build-and-test:
+          flavour: Driver
+      - assemble-and-release:
+          flavour: "Driver"
+          filters:
+            branches:
+              only:
+                - main_driver
+          requires:
+            - build-and-test
+  build-release-admin:
+    jobs:
+      - build-and-test:
+          flavour: Admin
+      - assemble-and-release:
+          flavour: Admin
+          filters:
+            branches:
+              only: main_admin
+          requires:
+            - build-and-test
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 04cbb6a..db9d346 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@ def relStoreFile = System.getenv("RELEASE_KEYSTORE")
 android {
     compileSdkVersion 31
     defaultConfig {
-        applicationId "h_mal.appttude.com"
+        applicationId "h_mal.appttude.com.driver"
         minSdkVersion 24
         targetSdkVersion 31
         versionCode 6
@@ -47,7 +47,7 @@ android {
 
     buildTypes {
         release {
-//            signingConfig signingConfigs.release
+            signingConfig signingConfigs.release
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
@@ -66,12 +66,11 @@ android {
     flavorDimensions "Default"
     productFlavors {
         driver {
-            applicationIdSuffix ".driver"
             versionCode 6
             versionName "1.0.5"
         }
         admin {
-            applicationIdSuffix ".driverAdmin"
+            applicationIdSuffix ".admin"
             versionCode 4
             versionName "0.0.5"
         }
@@ -84,7 +83,7 @@ android {
         }
         admin {
             manifest {
-                srcFile 'src/driver_admin/AndroidManifest.xml'
+                srcFile 'src/admin/AndroidManifest.xml'
             }
         }
     }
diff --git a/app/src/admin/AndroidManifest.xml b/app/src/admin/AndroidManifest.xml
new file mode 100644
index 0000000..0dd5de2
--- /dev/null
+++ b/app/src/admin/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- To auto-complete the email text field in the login form with the user's emails -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+    <application
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round">
+
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/app/src/admin/java/h_mal/appttude/com/objects/ApprovalsObject.kt b/app/src/admin/java/h_mal/appttude/com/driver/objects/ApprovalsObject.kt
similarity index 91%
rename from app/src/admin/java/h_mal/appttude/com/objects/ApprovalsObject.kt
rename to app/src/admin/java/h_mal/appttude/com/driver/objects/ApprovalsObject.kt
index bd9cadd..515307e 100644
--- a/app/src/admin/java/h_mal/appttude/com/objects/ApprovalsObject.kt
+++ b/app/src/admin/java/h_mal/appttude/com/driver/objects/ApprovalsObject.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.objects
+package h_mal.appttude.com.driver.admin.objects
 
 
 class ApprovalsObject {
@@ -29,6 +29,6 @@ class ApprovalsObject {
         this.mot_details_approval = mot_details_approval
         this.insurance_details_approval = insurance_details_approval
         this.log_book_approval = log_book_approval
-        ph_car_approval = private_hire_vehicle_approval
+        this.ph_car_approval = private_hire_vehicle_approval
     }
 }
\ No newline at end of file
diff --git a/app/src/admin/java/h_mal/appttude/com/driver/objects/ArchiveObject.kt b/app/src/admin/java/h_mal/appttude/com/driver/objects/ArchiveObject.kt
new file mode 100644
index 0000000..6595886
--- /dev/null
+++ b/app/src/admin/java/h_mal/appttude/com/driver/objects/ArchiveObject.kt
@@ -0,0 +1,33 @@
+package h_mal.appttude.com.driver.admin.objects
+
+import h_mal.appttude.com.driver.model.*
+import java.util.*
+
+class ArchiveObject {
+    var driver_license: HashMap<String, DriversLicense>? = null
+    var private_hire: HashMap<String, PrivateHireLicense>? = null
+    var vehicle_details: HashMap<String, VehicleProfile>? = null
+    var insurance_details: HashMap<String, Insurance>? = null
+    var mot_details: HashMap<String, Mot>? = null
+    var log_book: HashMap<String, Logbook>? = null
+    var ph_car: HashMap<String, PrivateHireVehicle>? = null
+
+    constructor()
+    constructor(
+        driver_license: HashMap<String, DriversLicense>?,
+        private_hire: HashMap<String, PrivateHireLicense>?,
+        vehicle_details: HashMap<String, VehicleProfile>?,
+        insurance_details: HashMap<String, Insurance>?,
+        mot_details: HashMap<String, Mot>?,
+        log_book: HashMap<String, Logbook>?,
+        private_hire_vehicle: HashMap<String, PrivateHireVehicle>?
+    ) {
+        this.driver_license = driver_license
+        this.private_hire = private_hire
+        this.vehicle_details = vehicle_details
+        this.insurance_details = insurance_details
+        this.mot_details = mot_details
+        this.log_book = log_book
+        this.ph_car = private_hire_vehicle
+    }
+}
\ No newline at end of file
diff --git a/app/src/admin/java/h_mal/appttude/com/objects/UserObject.kt b/app/src/admin/java/h_mal/appttude/com/driver/objects/UserObject.kt
similarity index 88%
rename from app/src/admin/java/h_mal/appttude/com/objects/UserObject.kt
rename to app/src/admin/java/h_mal/appttude/com/driver/objects/UserObject.kt
index 49f47a6..918d377 100644
--- a/app/src/admin/java/h_mal/appttude/com/objects/UserObject.kt
+++ b/app/src/admin/java/h_mal/appttude/com/driver/objects/UserObject.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.objects
+package h_mal.appttude.com.driver.admin.objects
 
 
 class UserObject {
diff --git a/app/src/admin/java/h_mal/appttude/com/objects/WholeDriverObject.kt b/app/src/admin/java/h_mal/appttude/com/driver/objects/WholeDriverObject.kt
similarity index 82%
rename from app/src/admin/java/h_mal/appttude/com/objects/WholeDriverObject.kt
rename to app/src/admin/java/h_mal/appttude/com/driver/objects/WholeDriverObject.kt
index 5ecbb80..727e872 100644
--- a/app/src/admin/java/h_mal/appttude/com/objects/WholeDriverObject.kt
+++ b/app/src/admin/java/h_mal/appttude/com/driver/objects/WholeDriverObject.kt
@@ -1,7 +1,7 @@
-package h_mal.appttude.com.objects
+package h_mal.appttude.com.driver.admin.objects
 
-import h_mal.appttude.com.objects.wholeObject.DriverProfile
-import h_mal.appttude.com.objects.wholeObject.VehicleProfile
+import h_mal.appttude.com.driver.admin.objects.wholeObject.DriverProfile
+import h_mal.appttude.com.driver.admin.objects.wholeObject.VehicleProfile
 
 
 class WholeDriverObject {
diff --git a/app/src/admin/java/h_mal/appttude/com/driver/objects/wholeObject/DriverProfile.kt b/app/src/admin/java/h_mal/appttude/com/driver/objects/wholeObject/DriverProfile.kt
new file mode 100644
index 0000000..36ffc4b
--- /dev/null
+++ b/app/src/admin/java/h_mal/appttude/com/driver/objects/wholeObject/DriverProfile.kt
@@ -0,0 +1,24 @@
+package h_mal.appttude.com.driver.admin.objects.wholeObject
+
+import h_mal.appttude.com.driver.model.DriverProfile
+import h_mal.appttude.com.driver.model.DriversLicense
+import h_mal.appttude.com.driver.model.PrivateHireLicense
+
+
+class DriverProfile {
+    var driver_profile: DriverProfile? = null
+    var driver_license: DriversLicense? = null
+    var private_hire: PrivateHireLicense? = null
+
+    constructor(
+        driver_profile: DriverProfile?,
+        driver_license: DriversLicense?,
+        private_hire: PrivateHireLicense?
+    ) {
+        this.driver_profile = driver_profile
+        this.driver_license = driver_license
+        this.private_hire = private_hire
+    }
+
+    constructor()
+}
\ No newline at end of file
diff --git a/app/src/admin/java/h_mal/appttude/com/objects/wholeObject/MappedObject.kt b/app/src/admin/java/h_mal/appttude/com/driver/objects/wholeObject/MappedObject.kt
similarity index 89%
rename from app/src/admin/java/h_mal/appttude/com/objects/wholeObject/MappedObject.kt
rename to app/src/admin/java/h_mal/appttude/com/driver/objects/wholeObject/MappedObject.kt
index 8a5cef2..20649ed 100644
--- a/app/src/admin/java/h_mal/appttude/com/objects/wholeObject/MappedObject.kt
+++ b/app/src/admin/java/h_mal/appttude/com/driver/objects/wholeObject/MappedObject.kt
@@ -1,8 +1,8 @@
-package h_mal.appttude.com.objects.wholeObject
+package h_mal.appttude.com.driver.admin.objects.wholeObject
 
 import android.os.Parcel
 import android.os.Parcelable
-import h_mal.appttude.com.objects.WholeDriverObject
+import h_mal.appttude.com.driver.admin.objects.WholeDriverObject
 
 
 class MappedObject : Parcelable {
diff --git a/app/src/admin/java/h_mal/appttude/com/driver/objects/wholeObject/VehicleProfile.kt b/app/src/admin/java/h_mal/appttude/com/driver/objects/wholeObject/VehicleProfile.kt
new file mode 100644
index 0000000..e2f3a26
--- /dev/null
+++ b/app/src/admin/java/h_mal/appttude/com/driver/objects/wholeObject/VehicleProfile.kt
@@ -0,0 +1,31 @@
+package h_mal.appttude.com.driver.admin.objects.wholeObject
+
+import h_mal.appttude.com.driver.model.Insurance
+import h_mal.appttude.com.driver.model.Logbook
+import h_mal.appttude.com.driver.model.PrivateHireVehicle
+import h_mal.appttude.com.driver.model.Mot
+import h_mal.appttude.com.driver.model.VehicleProfile
+
+
+class VehicleProfile {
+    var insurance_details: Insurance? = null
+    var log_book: Logbook? = null
+    var mot_details: Mot? = null
+    var vehicle_details: VehicleProfile? = null
+    var privateHireVehicle: PrivateHireVehicle? = null
+
+    constructor()
+    constructor(
+        insurance_details: Insurance?,
+        log_book: Logbook?,
+        mot_details: Mot?,
+        vehicle_details: VehicleProfile?,
+        private_hire_vehicle: PrivateHireVehicle?
+    ) {
+        this.insurance_details = insurance_details
+        this.log_book = log_book
+        this.mot_details = mot_details
+        this.vehicle_details = vehicle_details
+        this.privateHireVehicle = private_hire_vehicle
+    }
+}
\ No newline at end of file
diff --git a/app/src/admin/java/h_mal/appttude/com/ui/ApprovalListAdapter.kt b/app/src/admin/java/h_mal/appttude/com/driver/ui/ApprovalListAdapter.kt
similarity index 97%
rename from app/src/admin/java/h_mal/appttude/com/ui/ApprovalListAdapter.kt
rename to app/src/admin/java/h_mal/appttude/com/driver/ui/ApprovalListAdapter.kt
index a4bf99f..7456f16 100644
--- a/app/src/admin/java/h_mal/appttude/com/ui/ApprovalListAdapter.kt
+++ b/app/src/admin/java/h_mal/appttude/com/driver/ui/ApprovalListAdapter.kt
@@ -1,12 +1,12 @@
-package h_mal.appttude.com.ui
+package h_mal.appttude.com.driver.ui
 
 import android.app.Activity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
-import h_mal.appttude.com.objects.wholeObject.MappedObject
-import h_mal.appttude.com.R
+import h_mal.appttude.com.driver.admin.objects.wholeObject.MappedObject
+import h_mal.appttude.com.driver.R
 
 
 class ApprovalListAdapter(
diff --git a/app/src/admin/java/h_mal/appttude/com/ui/DriverStatusClass.kt b/app/src/admin/java/h_mal/appttude/com/driver/ui/DriverStatusClass.kt
similarity index 99%
rename from app/src/admin/java/h_mal/appttude/com/ui/DriverStatusClass.kt
rename to app/src/admin/java/h_mal/appttude/com/driver/ui/DriverStatusClass.kt
index e8fae9f..ada9224 100644
--- a/app/src/admin/java/h_mal/appttude/com/ui/DriverStatusClass.kt
+++ b/app/src/admin/java/h_mal/appttude/com/driver/ui/DriverStatusClass.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.ui
+package h_mal.appttude.com.driver.ui
 
 import android.app.AlertDialog
 import android.content.Context
diff --git a/app/src/admin/java/h_mal/appttude/com/ui/HomeSuperUserFragment.kt b/app/src/admin/java/h_mal/appttude/com/driver/ui/HomeSuperUserFragment.kt
similarity index 94%
rename from app/src/admin/java/h_mal/appttude/com/ui/HomeSuperUserFragment.kt
rename to app/src/admin/java/h_mal/appttude/com/driver/ui/HomeSuperUserFragment.kt
index 257e620..ea24f2c 100644
--- a/app/src/admin/java/h_mal/appttude/com/ui/HomeSuperUserFragment.kt
+++ b/app/src/admin/java/h_mal/appttude/com/driver/ui/HomeSuperUserFragment.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.ui
+package h_mal.appttude.com.driver.ui
 
 import android.app.AlertDialog
 import android.content.DialogInterface
@@ -8,14 +8,14 @@ import android.util.Log
 import android.view.*
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.database.ValueEventListener
-import h_mal.appttude.com.objects.WholeDriverObject
-import h_mal.appttude.com.objects.wholeObject.MappedObject
-import h_mal.appttude.com.R
-import kotlinx.android.synthetic.admin.fragment_home_super_user.*
+import h_mal.appttude.com.driver.admin.objects.WholeDriverObject
+import h_mal.appttude.com.driver.admin.objects.wholeObject.MappedObject
+import h_mal.appttude.com.driver.R
 import java.io.IOException
 import java.util.*
 
@@ -42,7 +42,7 @@ class HomeSuperUserFragment : Fragment() {
         // Inflate the layout for this fragment
         val view: View = inflater.inflate(R.layout.fragment_home_super_user, container, false)
 
-        recycler_view.apply {
+        view.findViewById<RecyclerView>(R.id.recycler_view).apply {
             layoutManager = LinearLayoutManager(context)
             recyclerViewAdapter = RecyclerViewAdapter(context, mappedObjectList)
             adapter = recyclerViewAdapter
diff --git a/app/src/admin/java/h_mal/appttude/com/driver/ui/MainActivity.kt b/app/src/admin/java/h_mal/appttude/com/driver/ui/MainActivity.kt
new file mode 100644
index 0000000..0edab52
--- /dev/null
+++ b/app/src/admin/java/h_mal/appttude/com/driver/ui/MainActivity.kt
@@ -0,0 +1,50 @@
+package h_mal.appttude.com.driver.ui
+
+
+import android.os.Bundle
+import com.google.firebase.auth.FirebaseUser
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.base.DrawerActivity
+import h_mal.appttude.com.driver.databinding.ActivityMainBinding
+import h_mal.appttude.com.driver.databinding.NavHeaderMainBinding
+import h_mal.appttude.com.driver.utils.setGlideImage
+import h_mal.appttude.com.driver.viewmodels.MainViewModel
+
+
+class MainActivity : DrawerActivity<MainViewModel, ActivityMainBinding>() {
+
+    override val containerId: Int = R.id.container
+    override val drawerLayoutId: Int = R.id.drawer_layout
+    override val toolbarId: Int = R.id.toolbar
+    override val navViewId: Int = R.id.nav_view
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        viewModel.getUserDetails()
+        setupLogoutInDrawer()
+    }
+
+    override fun onSuccess(data: Any?) {
+        super.onSuccess(data)
+        when (data) {
+            is FirebaseUser -> {
+                setupDrawer(data)
+            }
+        }
+    }
+
+    private fun setupDrawer(user: FirebaseUser) {
+        NavHeaderMainBinding.inflate(layoutInflater).apply {
+            driverEmail.text = user.email
+            driverName.text = user.displayName
+            profileImage.setGlideImage(user.photoUrl)
+        }
+    }
+
+    private fun setupLogoutInDrawer() {
+        binding.logout.setOnClickListener {
+            viewModel.logOut()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/admin/java/h_mal/appttude/com/ui/RecyclerViewAdapter.kt b/app/src/admin/java/h_mal/appttude/com/driver/ui/RecyclerViewAdapter.kt
similarity index 95%
rename from app/src/admin/java/h_mal/appttude/com/ui/RecyclerViewAdapter.kt
rename to app/src/admin/java/h_mal/appttude/com/driver/ui/RecyclerViewAdapter.kt
index 472199c..e545e4f 100644
--- a/app/src/admin/java/h_mal/appttude/com/ui/RecyclerViewAdapter.kt
+++ b/app/src/admin/java/h_mal/appttude/com/driver/ui/RecyclerViewAdapter.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.ui
+package h_mal.appttude.com.driver.ui
 
 import android.app.AlertDialog
 import android.content.Context
@@ -12,9 +12,9 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.squareup.picasso.Picasso
-import h_mal.appttude.com.objects.UserObject
-import h_mal.appttude.com.objects.wholeObject.MappedObject
-import h_mal.appttude.com.R
+import h_mal.appttude.com.driver.admin.objects.UserObject
+import h_mal.appttude.com.driver.admin.objects.wholeObject.MappedObject
+import h_mal.appttude.com.driver.R
 
 
 class RecyclerViewAdapter constructor(var context: Context?, var objects: List<MappedObject>?) :
diff --git a/app/src/admin/java/h_mal/appttude/com/ui/UserMainFragment.kt b/app/src/admin/java/h_mal/appttude/com/driver/ui/UserMainFragment.kt
similarity index 86%
rename from app/src/admin/java/h_mal/appttude/com/ui/UserMainFragment.kt
rename to app/src/admin/java/h_mal/appttude/com/driver/ui/UserMainFragment.kt
index 2129a30..ada4bdd 100644
--- a/app/src/admin/java/h_mal/appttude/com/ui/UserMainFragment.kt
+++ b/app/src/admin/java/h_mal/appttude/com/driver/ui/UserMainFragment.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.ui
+package h_mal.appttude.com.driver.ui
 
 import android.os.Bundle
 import android.util.Log
@@ -7,8 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.GridView
 import androidx.fragment.app.Fragment
-import h_mal.appttude.com.objects.wholeObject.MappedObject
-import h_mal.appttude.com.R
+import h_mal.appttude.com.driver.admin.objects.wholeObject.MappedObject
+import h_mal.appttude.com.driver.R
 
 
 class UserMainFragment : Fragment() {
diff --git a/app/src/admin/java/h_mal/appttude/com/objects/ArchiveObject.kt b/app/src/admin/java/h_mal/appttude/com/objects/ArchiveObject.kt
deleted file mode 100644
index 7858148..0000000
--- a/app/src/admin/java/h_mal/appttude/com/objects/ArchiveObject.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package h_mal.appttude.com.objects
-
-import h_mal.appttude.com.model.*
-import java.util.*
-
-class ArchiveObject {
-    var driver_license: HashMap<String, DriversLicenseObject>? = null
-    var private_hire: HashMap<String, PrivateHireObject>? = null
-    var vehicle_details: HashMap<String, VehicleProfileObject>? = null
-    var insurance_details: HashMap<String, InsuranceObject>? = null
-    var mot_details: HashMap<String, MotObject>? = null
-    var log_book: HashMap<String, LogbookObject>? = null
-    var ph_car: HashMap<String, PrivateHireVehicleObject>? = null
-
-    constructor()
-    constructor(
-        driver_license: HashMap<String, DriversLicenseObject>?,
-        private_hire: HashMap<String, PrivateHireObject>?,
-        vehicle_details: HashMap<String, VehicleProfileObject>?,
-        insurance_details: HashMap<String, InsuranceObject>?,
-        mot_details: HashMap<String, MotObject>?,
-        log_book: HashMap<String, LogbookObject>?,
-        private_hire_vehicle: HashMap<String, PrivateHireVehicleObject>?
-    ) {
-        this.driver_license = driver_license
-        this.private_hire = private_hire
-        this.vehicle_details = vehicle_details
-        this.insurance_details = insurance_details
-        this.mot_details = mot_details
-        this.log_book = log_book
-        this.ph_car = private_hire_vehicle
-    }
-}
\ No newline at end of file
diff --git a/app/src/admin/java/h_mal/appttude/com/objects/wholeObject/DriverProfile.kt b/app/src/admin/java/h_mal/appttude/com/objects/wholeObject/DriverProfile.kt
deleted file mode 100644
index e6d2cef..0000000
--- a/app/src/admin/java/h_mal/appttude/com/objects/wholeObject/DriverProfile.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package h_mal.appttude.com.objects.wholeObject
-
-import h_mal.appttude.com.model.DriverProfileObject
-import h_mal.appttude.com.model.DriversLicenseObject
-import h_mal.appttude.com.model.PrivateHireObject
-
-
-class DriverProfile {
-    var driver_profile: DriverProfileObject? = null
-    var driver_license: DriversLicenseObject? = null
-    var private_hire: PrivateHireObject? = null
-
-    constructor(
-        driver_profile: DriverProfileObject?,
-        driver_license: DriversLicenseObject?,
-        private_hire: PrivateHireObject?
-    ) {
-        this.driver_profile = driver_profile
-        this.driver_license = driver_license
-        this.private_hire = private_hire
-    }
-
-    constructor()
-}
\ No newline at end of file
diff --git a/app/src/admin/java/h_mal/appttude/com/objects/wholeObject/VehicleProfile.kt b/app/src/admin/java/h_mal/appttude/com/objects/wholeObject/VehicleProfile.kt
deleted file mode 100644
index 50fcb82..0000000
--- a/app/src/admin/java/h_mal/appttude/com/objects/wholeObject/VehicleProfile.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package h_mal.appttude.com.objects.wholeObject
-
-import h_mal.appttude.com.model.InsuranceObject
-import h_mal.appttude.com.model.LogbookObject
-import h_mal.appttude.com.model.PrivateHireVehicleObject
-import h_mal.appttude.com.model.MotObject
-import h_mal.appttude.com.model.VehicleProfileObject
-
-
-class VehicleProfile {
-    var insurance_details: InsuranceObject? = null
-    var log_book: LogbookObject? = null
-    var mot_details: MotObject? = null
-    var vehicle_details: VehicleProfileObject? = null
-    var privateHireVehicleObject: PrivateHireVehicleObject? = null
-
-    constructor()
-
-    //    public VehicleProfile(InsuranceObject insurance_details, LogbookObject log_book, MotObject mot_details, VehicleProfileObject vehicle_details) {
-    //        this.insurance_details = insurance_details;
-    //        this.log_book = log_book;
-    //        this.mot_details = mot_details;
-    //        this.vehicle_details = vehicle_details;
-    //    }
-    constructor(
-        insurance_details: InsuranceObject?,
-        log_book: LogbookObject?,
-        mot_details: MotObject?,
-        vehicle_details: VehicleProfileObject?,
-        private_hire_vehicle: PrivateHireVehicleObject?
-    ) {
-        this.insurance_details = insurance_details
-        this.log_book = log_book
-        this.mot_details = mot_details
-        this.vehicle_details = vehicle_details
-        privateHireVehicleObject = private_hire_vehicle
-    }
-}
\ No newline at end of file
diff --git a/app/src/admin/java/h_mal/appttude/com/ui/MainActivity.kt b/app/src/admin/java/h_mal/appttude/com/ui/MainActivity.kt
deleted file mode 100644
index 2a3ac76..0000000
--- a/app/src/admin/java/h_mal/appttude/com/ui/MainActivity.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-package h_mal.appttude.com.ui
-
-
-import android.os.Bundle
-import android.view.MenuItem
-import android.view.View
-import androidx.core.view.GravityCompat
-import androidx.navigation.NavController
-import androidx.navigation.findNavController
-import androidx.navigation.ui.AppBarConfiguration
-import androidx.navigation.ui.navigateUp
-import androidx.navigation.ui.setupActionBarWithNavController
-import androidx.navigation.ui.setupWithNavController
-import com.google.android.material.navigation.NavigationView
-import com.google.firebase.auth.FirebaseUser
-import h_mal.appttude.com.R
-import h_mal.appttude.com.base.BaseActivity
-import h_mal.appttude.com.dialogs.ExitDialog.displayExitDialog
-import h_mal.appttude.com.utils.setGlideImage
-import h_mal.appttude.com.viewmodels.MainViewModel
-import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.app_bar_main.*
-import kotlinx.android.synthetic.main.nav_header_main.view.*
-
-
-class MainActivity : BaseActivity<MainViewModel>(),
-    NavigationView.OnNavigationItemSelectedListener {
-
-    private val vm by createLazyViewModel<MainViewModel>()
-    override fun getViewModel(): MainViewModel = vm
-    override val layoutId: Int = R.layout.activity_main
-
-    lateinit var navController: NavController
-    lateinit var appBarConfiguration: AppBarConfiguration
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        setSupportActionBar(toolbar)
-        supportActionBar?.setDisplayShowTitleEnabled(false)
-        navController = findNavController(R.id.container)
-
-        appBarConfiguration = AppBarConfiguration(navController.graph, drawer_layout)
-        nav_view.setupWithNavController(navController)
-        setupActionBarWithNavController(navController, appBarConfiguration)
-
-        getViewModel().getUserDetails()
-        setupLogoutInDrawer()
-    }
-
-    override fun onSupportNavigateUp(): Boolean {
-        return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
-    }
-
-    override fun setTitle(title: CharSequence) {
-        toolbar.title = title
-    }
-
-    override fun onBackPressed() {
-        if (drawer_layout.isDrawerOpen(GravityCompat.START)) {
-            drawer_layout.closeDrawer(GravityCompat.START)
-        } else {
-            val navHostFragment = supportFragmentManager.findFragmentById(R.id.container)
-            navHostFragment?.childFragmentManager?.backStackEntryCount?.takeIf { it >= 1 }?.let {
-                return super.onBackPressed()
-            }
-            displayExitDialog()
-        }
-    }
-
-    override fun onSuccess(data: Any?) {
-        super.onSuccess(data)
-        when (data) {
-            is FirebaseUser -> {
-                setupDrawer(data)
-            }
-        }
-    }
-
-    private fun setupDrawer(user: FirebaseUser) {
-        val header: View = nav_view.getHeaderView(0)
-        header.driver_email.text = user.email
-        header.driver_name.text = user.displayName
-        header.profileImage.setGlideImage(user.photoUrl)
-    }
-
-    private fun setupLogoutInDrawer() {
-        logout.setOnClickListener {
-            getViewModel().logOut()
-        }
-    }
-
-    override fun onNavigationItemSelected(item: MenuItem): Boolean {
-        // Handle navigation view item clicks here.
-        when (item.itemId) {
-            R.id.nav_user_settings -> {}
-        }
-        drawer_layout.closeDrawer(GravityCompat.START)
-        return true
-    }
-}
\ No newline at end of file
diff --git a/app/src/admin/res/layout/fragment_home_super_user.xml b/app/src/admin/res/layout/fragment_home_super_user.xml
index 3c4de18..dcf94cf 100644
--- a/app/src/admin/res/layout/fragment_home_super_user.xml
+++ b/app/src/admin/res/layout/fragment_home_super_user.xml
@@ -8,7 +8,8 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        tools:listitem="@layout/list_item_layout">
 
     </androidx.recyclerview.widget.RecyclerView>
 
diff --git a/app/src/admin/res/navigation/main_navigation.xml b/app/src/admin/res/navigation/main_navigation.xml
new file mode 100644
index 0000000..befd4f9
--- /dev/null
+++ b/app/src/admin/res/navigation/main_navigation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_navigation"
+    app:startDestination="@id/homeAdminFragment">
+
+    <fragment
+        android:id="@+id/homeAdminFragment"
+        android:name="h_mal.appttude.com.driver.ui.HomeSuperUserFragment"
+        android:label="fragment_home"
+        tools:layout="@layout/fragment_home_super_user">
+    </fragment>
+
+</navigation>
\ No newline at end of file
diff --git a/app/src/androidTest/java/h_mal/appttude/com/BaseTestRobot.kt b/app/src/androidTest/java/h_mal/appttude/com/driver/BaseTestRobot.kt
similarity index 97%
rename from app/src/androidTest/java/h_mal/appttude/com/BaseTestRobot.kt
rename to app/src/androidTest/java/h_mal/appttude/com/driver/BaseTestRobot.kt
index abb03a9..0da5e65 100644
--- a/app/src/androidTest/java/h_mal/appttude/com/BaseTestRobot.kt
+++ b/app/src/androidTest/java/h_mal/appttude/com/driver/BaseTestRobot.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com
+package h_mal.appttude.com.driver
 
 import android.content.res.Resources
 import androidx.annotation.StringRes
diff --git a/app/src/androidTest/java/h_mal/appttude/com/BaseUiTest.kt b/app/src/androidTest/java/h_mal/appttude/com/driver/BaseUiTest.kt
similarity index 95%
rename from app/src/androidTest/java/h_mal/appttude/com/BaseUiTest.kt
rename to app/src/androidTest/java/h_mal/appttude/com/driver/BaseUiTest.kt
index 2db94f9..cc9e4fb 100644
--- a/app/src/androidTest/java/h_mal/appttude/com/BaseUiTest.kt
+++ b/app/src/androidTest/java/h_mal/appttude/com/driver/BaseUiTest.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com
+package h_mal.appttude.com.driver
 
 import android.view.View
 import androidx.annotation.StringRes
@@ -10,7 +10,7 @@ import androidx.test.espresso.UiController
 import androidx.test.espresso.ViewAction
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.platform.app.InstrumentationRegistry
-import h_mal.appttude.com.base.BaseActivity
+import h_mal.appttude.com.driver.base.BaseActivity
 import org.hamcrest.Matcher
 import org.junit.After
 import org.junit.Before
diff --git a/app/src/androidTest/java/h_mal/appttude/com/Constants.kt b/app/src/androidTest/java/h_mal/appttude/com/driver/Constants.kt
similarity index 78%
rename from app/src/androidTest/java/h_mal/appttude/com/Constants.kt
rename to app/src/androidTest/java/h_mal/appttude/com/driver/Constants.kt
index f13c1c1..5336d08 100644
--- a/app/src/androidTest/java/h_mal/appttude/com/Constants.kt
+++ b/app/src/androidTest/java/h_mal/appttude/com/driver/Constants.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com
+package h_mal.appttude.com.driver
 
 
 private const val apiKey = "test_key"
diff --git a/app/src/androidTest/java/h_mal/appttude/com/CustomViewMatchers.kt b/app/src/androidTest/java/h_mal/appttude/com/driver/CustomViewMatchers.kt
similarity index 95%
rename from app/src/androidTest/java/h_mal/appttude/com/CustomViewMatchers.kt
rename to app/src/androidTest/java/h_mal/appttude/com/driver/CustomViewMatchers.kt
index 46f9c13..148b37a 100644
--- a/app/src/androidTest/java/h_mal/appttude/com/CustomViewMatchers.kt
+++ b/app/src/androidTest/java/h_mal/appttude/com/driver/CustomViewMatchers.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com
+package h_mal.appttude.com.driver
 
 import android.view.View
 import android.widget.EditText
diff --git a/app/src/androidTest/java/h_mal/appttude/com/FirebaseTest.kt b/app/src/androidTest/java/h_mal/appttude/com/driver/FirebaseTest.kt
similarity index 94%
rename from app/src/androidTest/java/h_mal/appttude/com/FirebaseTest.kt
rename to app/src/androidTest/java/h_mal/appttude/com/driver/FirebaseTest.kt
index 95d0888..00302cc 100644
--- a/app/src/androidTest/java/h_mal/appttude/com/FirebaseTest.kt
+++ b/app/src/androidTest/java/h_mal/appttude/com/driver/FirebaseTest.kt
@@ -1,10 +1,10 @@
-package h_mal.appttude.com
+package h_mal.appttude.com.driver
 
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.database.FirebaseDatabase
 import com.google.firebase.storage.FirebaseStorage
-import h_mal.appttude.com.base.BaseActivity
-import h_mal.appttude.com.data.FirebaseAuthSource
+import h_mal.appttude.com.driver.base.BaseActivity
+import h_mal.appttude.com.driver.data.FirebaseAuthSource
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.tasks.await
 import org.junit.After
diff --git a/app/src/androidTest/java/h_mal/appttude/com/WebUtils.kt b/app/src/androidTest/java/h_mal/appttude/com/driver/WebUtils.kt
similarity index 98%
rename from app/src/androidTest/java/h_mal/appttude/com/WebUtils.kt
rename to app/src/androidTest/java/h_mal/appttude/com/driver/WebUtils.kt
index 72ce877..1d82427 100644
--- a/app/src/androidTest/java/h_mal/appttude/com/WebUtils.kt
+++ b/app/src/androidTest/java/h_mal/appttude/com/driver/WebUtils.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com
+package h_mal.appttude.com.driver
 
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
diff --git a/app/src/androidTest/java/h_mal/appttude/com/firebase/SignUpResponse.kt b/app/src/androidTest/java/h_mal/appttude/com/driver/firebase/SignUpResponse.kt
similarity index 83%
rename from app/src/androidTest/java/h_mal/appttude/com/firebase/SignUpResponse.kt
rename to app/src/androidTest/java/h_mal/appttude/com/driver/firebase/SignUpResponse.kt
index 5e0d8f8..4ae760e 100644
--- a/app/src/androidTest/java/h_mal/appttude/com/firebase/SignUpResponse.kt
+++ b/app/src/androidTest/java/h_mal/appttude/com/driver/firebase/SignUpResponse.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.firebase
+package h_mal.appttude.com.driver.firebase
 
 data class SignUpResponse(
     val expiresIn: String? = null,
diff --git a/app/src/androidTestDriver/java/h_mal/appttude/com/robots/HomeRobot.kt b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/HomeRobot.kt
similarity index 60%
rename from app/src/androidTestDriver/java/h_mal/appttude/com/robots/HomeRobot.kt
rename to app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/HomeRobot.kt
index feff2b9..50148c3 100644
--- a/app/src/androidTestDriver/java/h_mal/appttude/com/robots/HomeRobot.kt
+++ b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/HomeRobot.kt
@@ -1,7 +1,7 @@
-package h_mal.appttude.com.robots
+package h_mal.appttude.com.driver.robots
 
-import h_mal.appttude.com.BaseTestRobot
-import h_mal.appttude.com.R
+import h_mal.appttude.com.driver.BaseTestRobot
+import h_mal.appttude.com.driver.R
 
 fun home(func: HomeRobot.() -> Unit) = HomeRobot().apply { func() }
 class HomeRobot : BaseTestRobot() {
diff --git a/app/src/androidTestDriver/java/h_mal/appttude/com/robots/LoginRobot.kt b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/LoginRobot.kt
similarity index 82%
rename from app/src/androidTestDriver/java/h_mal/appttude/com/robots/LoginRobot.kt
rename to app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/LoginRobot.kt
index 74ce0b1..c7a76f9 100644
--- a/app/src/androidTestDriver/java/h_mal/appttude/com/robots/LoginRobot.kt
+++ b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/LoginRobot.kt
@@ -1,7 +1,7 @@
-package h_mal.appttude.com.robots
+package h_mal.appttude.com.driver.robots
 
-import h_mal.appttude.com.BaseTestRobot
-import h_mal.appttude.com.R
+import h_mal.appttude.com.driver.BaseTestRobot
+import h_mal.appttude.com.driver.R
 
 
 fun login(func: LoginRobot.() -> Unit) = LoginRobot().apply { func() }
diff --git a/app/src/androidTestDriver/java/h_mal/appttude/com/robots/RegisterRobot.kt b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/RegisterRobot.kt
similarity index 87%
rename from app/src/androidTestDriver/java/h_mal/appttude/com/robots/RegisterRobot.kt
rename to app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/RegisterRobot.kt
index ee28670..d0bced1 100644
--- a/app/src/androidTestDriver/java/h_mal/appttude/com/robots/RegisterRobot.kt
+++ b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/robots/RegisterRobot.kt
@@ -1,7 +1,7 @@
-package h_mal.appttude.com.robots
+package h_mal.appttude.com.driver.robots
 
-import h_mal.appttude.com.BaseTestRobot
-import h_mal.appttude.com.R
+import h_mal.appttude.com.driver.BaseTestRobot
+import h_mal.appttude.com.driver.R
 
 fun register(func: RegisterRobot.() -> Unit) = RegisterRobot().apply { func() }
 class RegisterRobot : BaseTestRobot() {
diff --git a/app/src/androidTestDriver/java/h_mal/appttude/com/tests/RegisteredUserAuthenticationActivityTest.kt b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/tests/RegisteredUserAuthenticationActivityTest.kt
similarity index 67%
rename from app/src/androidTestDriver/java/h_mal/appttude/com/tests/RegisteredUserAuthenticationActivityTest.kt
rename to app/src/androidTestDriver/java/h_mal/appttude/com/driver/tests/RegisteredUserAuthenticationActivityTest.kt
index a0668e3..6d02a78 100644
--- a/app/src/androidTestDriver/java/h_mal/appttude/com/tests/RegisteredUserAuthenticationActivityTest.kt
+++ b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/tests/RegisteredUserAuthenticationActivityTest.kt
@@ -1,14 +1,14 @@
-package h_mal.appttude.com.tests
+package h_mal.appttude.com.driver.tests
 
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import h_mal.appttude.com.FirebaseTest
-import h_mal.appttude.com.R
-import h_mal.appttude.com.USER_PASSWORD
-import h_mal.appttude.com.robots.home
-import h_mal.appttude.com.robots.login
-import h_mal.appttude.com.ui.user.LoginActivity
+import h_mal.appttude.com.driver.FirebaseTest
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.USER_PASSWORD
+import h_mal.appttude.com.driver.robots.home
+import h_mal.appttude.com.driver.robots.login
+import h_mal.appttude.com.driver.ui.user.LoginActivity
 import org.junit.*
 import org.junit.runner.RunWith
 
diff --git a/app/src/androidTestDriver/java/h_mal/appttude/com/tests/UserAuthenticationActivityTest.kt b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/tests/UserAuthenticationActivityTest.kt
similarity index 67%
rename from app/src/androidTestDriver/java/h_mal/appttude/com/tests/UserAuthenticationActivityTest.kt
rename to app/src/androidTestDriver/java/h_mal/appttude/com/driver/tests/UserAuthenticationActivityTest.kt
index 90fe4c7..c2a995a 100644
--- a/app/src/androidTestDriver/java/h_mal/appttude/com/tests/UserAuthenticationActivityTest.kt
+++ b/app/src/androidTestDriver/java/h_mal/appttude/com/driver/tests/UserAuthenticationActivityTest.kt
@@ -1,15 +1,15 @@
-package h_mal.appttude.com.tests
+package h_mal.appttude.com.driver.tests
 
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import h_mal.appttude.com.FirebaseTest
-import h_mal.appttude.com.R
-import h_mal.appttude.com.USER_PASSWORD
-import h_mal.appttude.com.robots.home
-import h_mal.appttude.com.robots.login
-import h_mal.appttude.com.robots.register
-import h_mal.appttude.com.ui.user.LoginActivity
+import h_mal.appttude.com.driver.FirebaseTest
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.USER_PASSWORD
+import h_mal.appttude.com.driver.robots.home
+import h_mal.appttude.com.driver.robots.login
+import h_mal.appttude.com.driver.robots.register
+import h_mal.appttude.com.driver.ui.user.LoginActivity
 import org.junit.*
 import org.junit.runner.RunWith
 
diff --git a/app/src/driver/AndroidManifest.xml b/app/src/driver/AndroidManifest.xml
index 813f6df..53dd8d6 100644
--- a/app/src/driver/AndroidManifest.xml
+++ b/app/src/driver/AndroidManifest.xml
@@ -1,39 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="h_mal.appttude.com.driver">
 
     <application
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round">
-        <activity
-            android:name="h_mal.appttude.com.ui.user.LoginActivity"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar.User"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="h_mal.appttude.com.ui.MainActivity"
-            android:configChanges="orientation|screenSize"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar" />
-        <activity
-            android:name="h_mal.appttude.com.ui.update.UpdateActivity"
-            android:theme="@style/AppTheme.NoActionBar.Update" />
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="h_mal.appttude.com.driver"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
     </application>
 
 </manifest>
diff --git a/app/src/driver/java/h_mal/appttude/com/ui/DriverOverallFragment.kt b/app/src/driver/java/h_mal/appttude/com/driver/ui/DriverOverallFragment.kt
similarity index 80%
rename from app/src/driver/java/h_mal/appttude/com/ui/DriverOverallFragment.kt
rename to app/src/driver/java/h_mal/appttude/com/driver/ui/DriverOverallFragment.kt
index ebf5148..1e6dbd5 100644
--- a/app/src/driver/java/h_mal/appttude/com/ui/DriverOverallFragment.kt
+++ b/app/src/driver/java/h_mal/appttude/com/driver/ui/DriverOverallFragment.kt
@@ -1,13 +1,13 @@
-package h_mal.appttude.com.ui
+package h_mal.appttude.com.driver.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import h_mal.appttude.com.R
-import h_mal.appttude.com.databinding.FragmentDriverOverallBinding
-import h_mal.appttude.com.utils.navigateTo
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.databinding.FragmentDriverOverallBinding
+import h_mal.appttude.com.driver.utils.navigateTo
 
 class DriverOverallFragment : Fragment() {
 
diff --git a/app/src/driver/java/h_mal/appttude/com/ui/HomeFragment.kt b/app/src/driver/java/h_mal/appttude/com/driver/ui/HomeFragment.kt
similarity index 74%
rename from app/src/driver/java/h_mal/appttude/com/ui/HomeFragment.kt
rename to app/src/driver/java/h_mal/appttude/com/driver/ui/HomeFragment.kt
index ff8735a..2aadb99 100644
--- a/app/src/driver/java/h_mal/appttude/com/ui/HomeFragment.kt
+++ b/app/src/driver/java/h_mal/appttude/com/driver/ui/HomeFragment.kt
@@ -1,15 +1,15 @@
-package h_mal.appttude.com.ui
+package h_mal.appttude.com.driver.ui
 
 import android.os.Bundle
 import android.view.View
-import h_mal.appttude.com.R
-import h_mal.appttude.com.base.DataSubmissionBaseFragment
-import h_mal.appttude.com.data.DRIVER
-import h_mal.appttude.com.databinding.FragmentHomeDriverBinding
-import h_mal.appttude.com.utils.hide
-import h_mal.appttude.com.utils.navigateTo
-import h_mal.appttude.com.utils.show
-import h_mal.appttude.com.viewmodels.RoleViewModel
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
+import h_mal.appttude.com.driver.data.DRIVER
+import h_mal.appttude.com.driver.databinding.FragmentHomeDriverBinding
+import h_mal.appttude.com.driver.utils.hide
+import h_mal.appttude.com.driver.utils.navigateTo
+import h_mal.appttude.com.driver.utils.show
+import h_mal.appttude.com.driver.viewmodels.RoleViewModel
 
 
 class HomeFragment :
diff --git a/app/src/driver/java/h_mal/appttude/com/driver/ui/MainActivity.kt b/app/src/driver/java/h_mal/appttude/com/driver/ui/MainActivity.kt
new file mode 100644
index 0000000..270d7ba
--- /dev/null
+++ b/app/src/driver/java/h_mal/appttude/com/driver/ui/MainActivity.kt
@@ -0,0 +1,51 @@
+package h_mal.appttude.com.driver.ui
+
+
+import android.os.Bundle
+import com.google.firebase.auth.FirebaseUser
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.base.DrawerActivity
+import h_mal.appttude.com.driver.databinding.ActivityMainBinding
+import h_mal.appttude.com.driver.databinding.NavHeaderMainBinding
+import h_mal.appttude.com.driver.utils.setGlideImage
+import h_mal.appttude.com.driver.viewmodels.MainViewModel
+
+
+class MainActivity : DrawerActivity<MainViewModel, ActivityMainBinding>() {
+
+    override val containerId: Int = R.id.container
+    override val drawerLayoutId: Int = R.id.drawer_layout
+    override val toolbarId: Int = R.id.toolbar
+    override val navViewId: Int = R.id.nav_view
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        viewModel.getUserDetails()
+        setupLogoutInDrawer()
+    }
+
+    override fun onSuccess(data: Any?) {
+        super.onSuccess(data)
+
+        when (data) {
+            is FirebaseUser -> {
+                setupDrawer(data)
+            }
+        }
+    }
+
+    private fun setupDrawer(user: FirebaseUser) {
+        NavHeaderMainBinding.inflate(layoutInflater).apply {
+            driverEmail.text = user.email
+            driverName.text = user.displayName
+            profileImage.setGlideImage(user.photoUrl)
+        }
+    }
+
+    private fun setupLogoutInDrawer() {
+        binding.logout.setOnClickListener {
+            viewModel.logOut()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/driver/java/h_mal/appttude/com/ui/VehicleOverallFragment.kt b/app/src/driver/java/h_mal/appttude/com/driver/ui/VehicleOverallFragment.kt
similarity index 82%
rename from app/src/driver/java/h_mal/appttude/com/ui/VehicleOverallFragment.kt
rename to app/src/driver/java/h_mal/appttude/com/driver/ui/VehicleOverallFragment.kt
index 7df8870..b3bc57e 100644
--- a/app/src/driver/java/h_mal/appttude/com/ui/VehicleOverallFragment.kt
+++ b/app/src/driver/java/h_mal/appttude/com/driver/ui/VehicleOverallFragment.kt
@@ -1,13 +1,13 @@
-package h_mal.appttude.com.ui
+package h_mal.appttude.com.driver.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import h_mal.appttude.com.R
-import h_mal.appttude.com.databinding.FragmentVehicleOverallBinding
-import h_mal.appttude.com.utils.navigateTo
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.databinding.FragmentVehicleOverallBinding
+import h_mal.appttude.com.driver.utils.navigateTo
 
 
 class VehicleOverallFragment : Fragment() {
diff --git a/app/src/driver/java/h_mal/appttude/com/ui/WelcomeFragment.kt b/app/src/driver/java/h_mal/appttude/com/driver/ui/WelcomeFragment.kt
similarity index 74%
rename from app/src/driver/java/h_mal/appttude/com/ui/WelcomeFragment.kt
rename to app/src/driver/java/h_mal/appttude/com/driver/ui/WelcomeFragment.kt
index a1dce70..b0c308c 100644
--- a/app/src/driver/java/h_mal/appttude/com/ui/WelcomeFragment.kt
+++ b/app/src/driver/java/h_mal/appttude/com/driver/ui/WelcomeFragment.kt
@@ -1,13 +1,13 @@
-package h_mal.appttude.com.ui
+package h_mal.appttude.com.driver.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import h_mal.appttude.com.R
-import h_mal.appttude.com.databinding.FragmentWelcomeBinding
-import h_mal.appttude.com.utils.navigateTo
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.databinding.FragmentWelcomeBinding
+import h_mal.appttude.com.driver.utils.navigateTo
 
 
 class WelcomeFragment : Fragment() {
diff --git a/app/src/driver/java/h_mal/appttude/com/ui/driverprofile/DriverLicenseFragment.kt b/app/src/driver/java/h_mal/appttude/com/driver/ui/driverprofile/DriverLicenseFragment.kt
similarity index 75%
rename from app/src/driver/java/h_mal/appttude/com/ui/driverprofile/DriverLicenseFragment.kt
rename to app/src/driver/java/h_mal/appttude/com/driver/ui/driverprofile/DriverLicenseFragment.kt
index 7757c4a..ffddae4 100644
--- a/app/src/driver/java/h_mal/appttude/com/ui/driverprofile/DriverLicenseFragment.kt
+++ b/app/src/driver/java/h_mal/appttude/com/driver/ui/driverprofile/DriverLicenseFragment.kt
@@ -1,13 +1,13 @@
-package h_mal.appttude.com.ui.driverprofile
+package h_mal.appttude.com.driver.ui.driverprofile
 
 import android.net.Uri
-import h_mal.appttude.com.base.DataSubmissionBaseFragment
-import h_mal.appttude.com.databinding.FragmentDriverLicenseBinding
-import h_mal.appttude.com.dialogs.DateDialog
-import h_mal.appttude.com.model.DriversLicense
-import h_mal.appttude.com.utils.isTrue
-import h_mal.appttude.com.utils.setGlideImage
-import h_mal.appttude.com.viewmodels.DriverLicenseViewModel
+import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentDriverLicenseBinding
+import h_mal.appttude.com.driver.dialogs.DateDialog
+import h_mal.appttude.com.driver.model.DriversLicense
+import h_mal.appttude.com.driver.utils.isTrue
+import h_mal.appttude.com.driver.utils.setGlideImage
+import h_mal.appttude.com.driver.viewmodels.DriverLicenseViewModel
 
 class DriverLicenseFragment :
     DataSubmissionBaseFragment<DriverLicenseViewModel, FragmentDriverLicenseBinding, DriversLicense>() {
diff --git a/app/src/driver/java/h_mal/appttude/com/ui/driverprofile/DriverProfileFragment.kt b/app/src/driver/java/h_mal/appttude/com/driver/ui/driverprofile/DriverProfileFragment.kt
similarity index 81%
rename from app/src/driver/java/h_mal/appttude/com/ui/driverprofile/DriverProfileFragment.kt
rename to app/src/driver/java/h_mal/appttude/com/driver/ui/driverprofile/DriverProfileFragment.kt
index d07a498..91b0022 100644
--- a/app/src/driver/java/h_mal/appttude/com/ui/driverprofile/DriverProfileFragment.kt
+++ b/app/src/driver/java/h_mal/appttude/com/driver/ui/driverprofile/DriverProfileFragment.kt
@@ -1,13 +1,13 @@
-package h_mal.appttude.com.ui.driverprofile
+package h_mal.appttude.com.driver.ui.driverprofile
 
 import android.net.Uri
-import h_mal.appttude.com.base.DataSubmissionBaseFragment
-import h_mal.appttude.com.databinding.FragmentDriverProfileBinding
-import h_mal.appttude.com.dialogs.DateDialog
-import h_mal.appttude.com.model.DriverProfile
-import h_mal.appttude.com.utils.isTrue
-import h_mal.appttude.com.utils.setGlideImage
-import h_mal.appttude.com.viewmodels.DriverProfileViewModel
+import h_mal.appttude.com.driver.databinding.FragmentDriverProfileBinding
+import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
+import h_mal.appttude.com.driver.dialogs.DateDialog
+import h_mal.appttude.com.driver.model.DriverProfile
+import h_mal.appttude.com.driver.utils.isTrue
+import h_mal.appttude.com.driver.utils.setGlideImage
+import h_mal.appttude.com.driver.viewmodels.DriverProfileViewModel
 
 
 class DriverProfileFragment :
diff --git a/app/src/driver/java/h_mal/appttude/com/ui/driverprofile/PrivateHireLicenseFragment.kt b/app/src/driver/java/h_mal/appttude/com/driver/ui/driverprofile/PrivateHireLicenseFragment.kt
similarity index 74%
rename from app/src/driver/java/h_mal/appttude/com/ui/driverprofile/PrivateHireLicenseFragment.kt
rename to app/src/driver/java/h_mal/appttude/com/driver/ui/driverprofile/PrivateHireLicenseFragment.kt
index 5bb4343..8c92dbd 100644
--- a/app/src/driver/java/h_mal/appttude/com/ui/driverprofile/PrivateHireLicenseFragment.kt
+++ b/app/src/driver/java/h_mal/appttude/com/driver/ui/driverprofile/PrivateHireLicenseFragment.kt
@@ -1,13 +1,13 @@
-package h_mal.appttude.com.ui.driverprofile
+package h_mal.appttude.com.driver.ui.driverprofile
 
 import android.net.Uri
-import h_mal.appttude.com.base.DataSubmissionBaseFragment
-import h_mal.appttude.com.databinding.FragmentPrivateHireLicenseBinding
-import h_mal.appttude.com.dialogs.DateDialog
-import h_mal.appttude.com.model.PrivateHireLicense
-import h_mal.appttude.com.utils.isTrue
-import h_mal.appttude.com.utils.setGlideImage
-import h_mal.appttude.com.viewmodels.PrivateHireLicenseViewModel
+import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentPrivateHireLicenseBinding
+import h_mal.appttude.com.driver.dialogs.DateDialog
+import h_mal.appttude.com.driver.model.PrivateHireLicense
+import h_mal.appttude.com.driver.utils.isTrue
+import h_mal.appttude.com.driver.utils.setGlideImage
+import h_mal.appttude.com.driver.viewmodels.PrivateHireLicenseViewModel
 
 
 class PrivateHireLicenseFragment : DataSubmissionBaseFragment
diff --git a/app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/InsuranceFragment.kt b/app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/InsuranceFragment.kt
similarity index 82%
rename from app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/InsuranceFragment.kt
rename to app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/InsuranceFragment.kt
index d4a71ed..2f304b1 100644
--- a/app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/InsuranceFragment.kt
+++ b/app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/InsuranceFragment.kt
@@ -1,16 +1,16 @@
-package h_mal.appttude.com.ui.vehicleprofile
+package h_mal.appttude.com.driver.ui.vehicleprofile
 
 import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.widget.ImageView
-import h_mal.appttude.com.base.DataSubmissionBaseFragment
-import h_mal.appttude.com.databinding.FragmentInsuranceBinding
-import h_mal.appttude.com.dialogs.DateDialog
-import h_mal.appttude.com.model.Insurance
-import h_mal.appttude.com.utils.isTrue
-import h_mal.appttude.com.utils.setGlideImage
-import h_mal.appttude.com.viewmodels.InsuranceViewModel
+import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentInsuranceBinding
+import h_mal.appttude.com.driver.dialogs.DateDialog
+import h_mal.appttude.com.driver.model.Insurance
+import h_mal.appttude.com.driver.utils.isTrue
+import h_mal.appttude.com.driver.utils.setGlideImage
+import h_mal.appttude.com.driver.viewmodels.InsuranceViewModel
 
 
 class InsuranceFragment :
diff --git a/app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/LogbookFragment.kt b/app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/LogbookFragment.kt
similarity index 72%
rename from app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/LogbookFragment.kt
rename to app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/LogbookFragment.kt
index 3c0a9da..fc37aa9 100644
--- a/app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/LogbookFragment.kt
+++ b/app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/LogbookFragment.kt
@@ -1,12 +1,12 @@
-package h_mal.appttude.com.ui.vehicleprofile
+package h_mal.appttude.com.driver.ui.vehicleprofile
 
 import android.net.Uri
-import h_mal.appttude.com.base.DataSubmissionBaseFragment
-import h_mal.appttude.com.databinding.FragmentLogbookBinding
-import h_mal.appttude.com.model.Logbook
-import h_mal.appttude.com.utils.isTrue
-import h_mal.appttude.com.utils.setGlideImage
-import h_mal.appttude.com.viewmodels.LogbookViewModel
+import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentLogbookBinding
+import h_mal.appttude.com.driver.model.Logbook
+import h_mal.appttude.com.driver.utils.isTrue
+import h_mal.appttude.com.driver.utils.setGlideImage
+import h_mal.appttude.com.driver.viewmodels.LogbookViewModel
 
 
 class LogbookFragment :
diff --git a/app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/MotFragment.kt b/app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/MotFragment.kt
similarity index 70%
rename from app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/MotFragment.kt
rename to app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/MotFragment.kt
index 4ea534b..8aed6be 100644
--- a/app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/MotFragment.kt
+++ b/app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/MotFragment.kt
@@ -1,13 +1,13 @@
-package h_mal.appttude.com.ui.vehicleprofile
+package h_mal.appttude.com.driver.ui.vehicleprofile
 
 import android.net.Uri
-import h_mal.appttude.com.base.DataSubmissionBaseFragment
-import h_mal.appttude.com.databinding.FragmentMotBinding
-import h_mal.appttude.com.dialogs.DateDialog
-import h_mal.appttude.com.model.Mot
-import h_mal.appttude.com.utils.isTrue
-import h_mal.appttude.com.utils.setGlideImage
-import h_mal.appttude.com.viewmodels.MotViewModel
+import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentMotBinding
+import h_mal.appttude.com.driver.dialogs.DateDialog
+import h_mal.appttude.com.driver.model.Mot
+import h_mal.appttude.com.driver.utils.isTrue
+import h_mal.appttude.com.driver.utils.setGlideImage
+import h_mal.appttude.com.driver.viewmodels.MotViewModel
 
 
 class MotFragment : DataSubmissionBaseFragment<MotViewModel, FragmentMotBinding, Mot>() {
diff --git a/app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/PrivateHireVehicleFragment.kt b/app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/PrivateHireVehicleFragment.kt
similarity index 72%
rename from app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/PrivateHireVehicleFragment.kt
rename to app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/PrivateHireVehicleFragment.kt
index 3af05a6..aaa8ab8 100644
--- a/app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/PrivateHireVehicleFragment.kt
+++ b/app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/PrivateHireVehicleFragment.kt
@@ -1,13 +1,13 @@
-package h_mal.appttude.com.ui.vehicleprofile
+package h_mal.appttude.com.driver.ui.vehicleprofile
 
 import android.net.Uri
-import h_mal.appttude.com.base.DataSubmissionBaseFragment
-import h_mal.appttude.com.databinding.FragmentPrivateHireLicenseBinding
-import h_mal.appttude.com.dialogs.DateDialog
-import h_mal.appttude.com.model.PrivateHireVehicle
-import h_mal.appttude.com.utils.isTrue
-import h_mal.appttude.com.utils.setGlideImage
-import h_mal.appttude.com.viewmodels.PrivateHireVehicleViewModel
+import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentPrivateHireLicenseBinding
+import h_mal.appttude.com.driver.dialogs.DateDialog
+import h_mal.appttude.com.driver.model.PrivateHireVehicle
+import h_mal.appttude.com.driver.utils.isTrue
+import h_mal.appttude.com.driver.utils.setGlideImage
+import h_mal.appttude.com.driver.viewmodels.PrivateHireVehicleViewModel
 
 
 class PrivateHireVehicleFragment :
diff --git a/app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/VehicleProfileFragment.kt b/app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/VehicleProfileFragment.kt
similarity index 81%
rename from app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/VehicleProfileFragment.kt
rename to app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/VehicleProfileFragment.kt
index 6fc99d1..9e143c5 100644
--- a/app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/VehicleProfileFragment.kt
+++ b/app/src/driver/java/h_mal/appttude/com/driver/ui/vehicleprofile/VehicleProfileFragment.kt
@@ -1,11 +1,11 @@
-package h_mal.appttude.com.ui.vehicleprofile
+package h_mal.appttude.com.driver.ui.vehicleprofile
 
-import h_mal.appttude.com.base.DataSubmissionBaseFragment
-import h_mal.appttude.com.databinding.FragmentVehicleSetupBinding
-import h_mal.appttude.com.dialogs.DateDialog
-import h_mal.appttude.com.model.VehicleProfile
-import h_mal.appttude.com.utils.isTrue
-import h_mal.appttude.com.viewmodels.VehicleProfileViewModel
+import h_mal.appttude.com.driver.base.DataSubmissionBaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentVehicleSetupBinding
+import h_mal.appttude.com.driver.dialogs.DateDialog
+import h_mal.appttude.com.driver.model.VehicleProfile
+import h_mal.appttude.com.driver.utils.isTrue
+import h_mal.appttude.com.driver.viewmodels.VehicleProfileViewModel
 
 
 class VehicleProfileFragment : DataSubmissionBaseFragment
diff --git a/app/src/main/res/navigation/main_navigation.xml b/app/src/driver/res/navigation/main_navigation.xml
similarity index 85%
rename from app/src/main/res/navigation/main_navigation.xml
rename to app/src/driver/res/navigation/main_navigation.xml
index 6384ebf..53a8226 100644
--- a/app/src/main/res/navigation/main_navigation.xml
+++ b/app/src/driver/res/navigation/main_navigation.xml
@@ -6,7 +6,7 @@
 
     <fragment
         android:id="@+id/homeDriverFragment"
-        android:name="h_mal.appttude.com.ui.HomeFragment"
+        android:name="h_mal.appttude.com.driver.ui.HomeFragment"
         android:label="fragment_home"
         tools:layout="@layout/fragment_home_driver">
         <action
@@ -26,7 +26,7 @@
     </fragment>
     <fragment
         android:id="@+id/driverOverallFragment"
-        android:name="h_mal.appttude.com.ui.DriverOverallFragment"
+        android:name="h_mal.appttude.com.driver.ui.DriverOverallFragment"
         android:label="DriverOverallFragment"
         tools:layout="@layout/fragment_driver_overall">
         <action
@@ -54,7 +54,7 @@
     </fragment>
     <fragment
         android:id="@+id/vehicleOverallFragment"
-        android:name="h_mal.appttude.com.ui.VehicleOverallFragment"
+        android:name="h_mal.appttude.com.driver.ui.VehicleOverallFragment"
         android:label="VehicleOverallFragment"
         tools:layout="@layout/fragment_vehicle_overall">
         <action
@@ -96,49 +96,49 @@
     </fragment>
     <fragment
         android:id="@+id/driverProfileFragment"
-        android:name="h_mal.appttude.com.ui.driverprofile.DriverProfileFragment"
+        android:name="h_mal.appttude.com.driver.ui.driverprofile.DriverProfileFragment"
         android:label="fragment_driver_profile"
         tools:layout="@layout/fragment_driver_profile" />
     <fragment
         android:id="@+id/driverLicenseFragment"
-        android:name="h_mal.appttude.com.ui.driverprofile.DriverLicenseFragment"
+        android:name="h_mal.appttude.com.driver.ui.driverprofile.DriverLicenseFragment"
         android:label="fragment_driver_license"
         tools:layout="@layout/fragment_driver_license" />
 
 
     <fragment
         android:id="@+id/vehicleSetupFragment"
-        android:name="h_mal.appttude.com.ui.vehicleprofile.VehicleProfileFragment"
+        android:name="h_mal.appttude.com.driver.ui.vehicleprofile.VehicleProfileFragment"
         android:label="VehicleSetupFragment"
         tools:layout="@layout/fragment_vehicle_setup" />
     <fragment
         android:id="@+id/insuranceFragment"
-        android:name="h_mal.appttude.com.ui.vehicleprofile.InsuranceFragment"
+        android:name="h_mal.appttude.com.driver.ui.vehicleprofile.InsuranceFragment"
         android:label="InsuranceFragment"
         tools:layout="@layout/fragment_insurance" />
     <fragment
         android:id="@+id/motFragment"
-        android:name="h_mal.appttude.com.ui.vehicleprofile.MotFragment"
+        android:name="h_mal.appttude.com.driver.ui.vehicleprofile.MotFragment"
         android:label="MotFragment"
         tools:layout="@layout/fragment_mot" />
     <fragment
         android:id="@+id/logbookFragment"
-        android:name="h_mal.appttude.com.ui.vehicleprofile.LogbookFragment"
+        android:name="h_mal.appttude.com.driver.ui.vehicleprofile.LogbookFragment"
         android:label="fragment_logbook"
         tools:layout="@layout/fragment_logbook" />
     <activity
         android:id="@+id/nav_user_settings"
-        android:name="h_mal.appttude.com.ui.update.UpdateActivity"
+        android:name="h_mal.appttude.com.driver.ui.update.UpdateActivity"
         android:label="fragment_profile"
         tools:layout="@layout/update_activity" />
     <fragment
         android:id="@+id/privateHireLicenseFragment2"
-        android:name="h_mal.appttude.com.ui.driverprofile.PrivateHireLicenseFragment"
+        android:name="h_mal.appttude.com.driver.ui.driverprofile.PrivateHireLicenseFragment"
         android:label="fragment_private_hire_license"
         tools:layout="@layout/fragment_private_hire_license" />
     <fragment
         android:id="@+id/privateHireVehicleFragment"
-        android:name="h_mal.appttude.com.ui.vehicleprofile.PrivateHireVehicleFragment"
+        android:name="h_mal.appttude.com.driver.ui.vehicleprofile.PrivateHireVehicleFragment"
         android:label="fragment_private_hire_vehicle"
         tools:layout="@layout/fragment_private_hire_vehicle" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7817eb2..2c36fa8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,18 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="h_mal.appttude.com">
+    package="h_mal.appttude.com.driver">
     <!-- To auto-complete the email text field in the login form with the user's emails -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
-        android:name="h_mal.appttude.com.application.DriverApplication"
+        android:name="h_mal.appttude.com.driver.application.DriverApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <activity
+            android:name="h_mal.appttude.com.driver.ui.user.LoginActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar.User"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.VIEW" />
 
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="h_mal.appttude.com.driver.ui.MainActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name="h_mal.appttude.com.driver.ui.update.UpdateActivity"
+            android:theme="@style/AppTheme.NoActionBar.Update" />
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="h_mal.appttude.com.driver"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/h_mal/appttude/com/data/Roles.kt b/app/src/main/java/h_mal/appttude/com/data/Roles.kt
deleted file mode 100644
index ec69b30..0000000
--- a/app/src/main/java/h_mal/appttude/com/data/Roles.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package h_mal.appttude.com.data
-
-const val DRIVER = "driver"
-const val ADMIN = "super_user"
\ No newline at end of file
diff --git a/app/src/main/java/h_mal/appttude/com/application/ApplicationViewModelFactory.kt b/app/src/main/java/h_mal/appttude/com/driver/application/ApplicationViewModelFactory.kt
similarity index 90%
rename from app/src/main/java/h_mal/appttude/com/application/ApplicationViewModelFactory.kt
rename to app/src/main/java/h_mal/appttude/com/driver/application/ApplicationViewModelFactory.kt
index 9189179..224b355 100644
--- a/app/src/main/java/h_mal/appttude/com/application/ApplicationViewModelFactory.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/application/ApplicationViewModelFactory.kt
@@ -1,11 +1,11 @@
-package h_mal.appttude.com.application
+package h_mal.appttude.com.driver.application
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import h_mal.appttude.com.data.FirebaseAuthSource
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.viewmodels.*
+import h_mal.appttude.com.driver.data.FirebaseAuthSource
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.viewmodels.*
 
 class ApplicationViewModelFactory(
     private val auth: FirebaseAuthSource,
diff --git a/app/src/main/java/h_mal/appttude/com/application/DriverApplication.kt b/app/src/main/java/h_mal/appttude/com/driver/application/DriverApplication.kt
similarity index 77%
rename from app/src/main/java/h_mal/appttude/com/application/DriverApplication.kt
rename to app/src/main/java/h_mal/appttude/com/driver/application/DriverApplication.kt
index 723dedb..96b78a2 100644
--- a/app/src/main/java/h_mal/appttude/com/application/DriverApplication.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/application/DriverApplication.kt
@@ -1,9 +1,9 @@
-package h_mal.appttude.com.application
+package h_mal.appttude.com.driver.application
 
 import android.app.Application
-import h_mal.appttude.com.data.FirebaseAuthSource
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.data.FirebaseAuthSource
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
 import org.kodein.di.Kodein
 import org.kodein.di.KodeinAware
 import org.kodein.di.android.x.androidXModule
diff --git a/app/src/main/java/h_mal/appttude/com/Archive/ArchiveFragment.kt b/app/src/main/java/h_mal/appttude/com/driver/archive/ArchiveFragment.kt
similarity index 94%
rename from app/src/main/java/h_mal/appttude/com/Archive/ArchiveFragment.kt
rename to app/src/main/java/h_mal/appttude/com/driver/archive/ArchiveFragment.kt
index 5dce8ec..6b043d6 100644
--- a/app/src/main/java/h_mal/appttude/com/Archive/ArchiveFragment.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/archive/ArchiveFragment.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.Archive
+package h_mal.appttude.com.driver.archive
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import android.widget.ListView
 import androidx.fragment.app.Fragment
 import com.google.firebase.database.DatabaseReference
-import h_mal.appttude.com.R
+import h_mal.appttude.com.driver.R
 
 class ArchiveFragment : Fragment() {
     //    var archive: ArchiveObject? = null
diff --git a/app/src/main/java/h_mal/appttude/com/Archive/ArchiveObjectListAdapter.kt b/app/src/main/java/h_mal/appttude/com/driver/archive/ArchiveObjectListAdapter.kt
similarity index 97%
rename from app/src/main/java/h_mal/appttude/com/Archive/ArchiveObjectListAdapter.kt
rename to app/src/main/java/h_mal/appttude/com/driver/archive/ArchiveObjectListAdapter.kt
index ecaca7b..d450244 100644
--- a/app/src/main/java/h_mal/appttude/com/Archive/ArchiveObjectListAdapter.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/archive/ArchiveObjectListAdapter.kt
@@ -1,14 +1,14 @@
-package h_mal.appttude.com.Archive
+package h_mal.appttude.com.driver.archive
 
-//import h_mal.appttude.com.Global.FirebaseClass
-//import h_mal.appttude.com.Global.ImageSwiperClass
-//import h_mal.appttude.com.Objects.ArchiveObject
+//import h_mal.appttude.com.driver.Global.FirebaseClass
+//import h_mal.appttude.com.driver.Global.ImageSwiperClass
+//import h_mal.appttude.com.driver.Objects.ArchiveObject
 import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
 import android.widget.TextView
-import h_mal.appttude.com.utils.DateUtils.convertDateStringDatePattern
+import h_mal.appttude.com.driver.utils.DateUtils.convertDateStringDatePattern
 import java.text.ParseException
 
 class ArchiveObjectListAdapter(
diff --git a/app/src/main/java/h_mal/appttude/com/base/BaseActivity.kt b/app/src/main/java/h_mal/appttude/com/driver/base/BaseActivity.kt
similarity index 87%
rename from app/src/main/java/h_mal/appttude/com/base/BaseActivity.kt
rename to app/src/main/java/h_mal/appttude/com/driver/base/BaseActivity.kt
index 79b7dba..0cef4bd 100644
--- a/app/src/main/java/h_mal/appttude/com/base/BaseActivity.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/base/BaseActivity.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.base
+package h_mal.appttude.com.driver.base
 
 import android.content.Intent
 import android.os.Bundle
@@ -12,10 +12,10 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelLazy
 import androidx.test.espresso.IdlingResource
 import androidx.viewbinding.ViewBinding
-import h_mal.appttude.com.R
-import h_mal.appttude.com.application.ApplicationViewModelFactory
-import h_mal.appttude.com.data.ViewState
-import h_mal.appttude.com.utils.*
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.application.ApplicationViewModelFactory
+import h_mal.appttude.com.driver.data.ViewState
+import h_mal.appttude.com.driver.utils.*
 import org.kodein.di.KodeinAware
 import org.kodein.di.android.kodein
 import org.kodein.di.generic.instance
@@ -29,16 +29,18 @@ abstract class BaseActivity<V : BaseViewModel, VB : ViewBinding> : AppCompatActi
     private lateinit var loadingView: View
 
     private var _binding: VB? = null
-    private val binding: VB
+    val binding: VB
         get() = _binding ?: error("Must only access binding while fragment is attached.")
 
-
     val viewModel: V by createLazyViewModel()
 
     override val kodein by kodein()
-    val factory by instance<ApplicationViewModelFactory>()
+    private val factory by instance<ApplicationViewModelFactory>()
 
-    fun createLazyViewModel(): Lazy<V> = ViewModelLazy(
+    /**
+     * Create a lazy viewmodel based on the generic view model [V].
+     */
+    private fun createLazyViewModel(): Lazy<V> = ViewModelLazy(
         getGenericClassAt(0),
         { viewModelStore },
         { factory },
@@ -52,7 +54,10 @@ abstract class BaseActivity<V : BaseViewModel, VB : ViewBinding> : AppCompatActi
             ?.kotlin
             ?: throw IllegalStateException("Can not find class from generic argument")
 
-    fun inflateBindingByType(
+    /**
+     * Create a view binding out of the the generic [VB]
+     */
+    private fun inflateBindingByType(
         genericClassAt: KClass<VB>
     ): VB = try {
         @Suppress("UNCHECKED_CAST")
@@ -74,8 +79,14 @@ abstract class BaseActivity<V : BaseViewModel, VB : ViewBinding> : AppCompatActi
         setupView(binding)
     }
 
+
     open fun setupView(binding: VB) {}
 
+    /**
+     * Extension function which can be used in our child class for binding.
+     *
+     * @sample applyBinding { textView.text = "Hello" }
+     */
     fun applyBinding(block: VB.() -> Unit) {
         block(binding)
     }
diff --git a/app/src/main/java/h_mal/appttude/com/base/BaseFragment.kt b/app/src/main/java/h_mal/appttude/com/driver/base/BaseFragment.kt
similarity index 96%
rename from app/src/main/java/h_mal/appttude/com/base/BaseFragment.kt
rename to app/src/main/java/h_mal/appttude/com/driver/base/BaseFragment.kt
index ad21ec4..25e769b 100644
--- a/app/src/main/java/h_mal/appttude/com/base/BaseFragment.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/base/BaseFragment.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.base
+package h_mal.appttude.com.driver.base
 
 import android.app.Activity
 import android.content.ClipData
@@ -11,9 +11,9 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.createViewModelLazy
 import androidx.viewbinding.ViewBinding
-import h_mal.appttude.com.application.ApplicationViewModelFactory
-import h_mal.appttude.com.data.ViewState
-import h_mal.appttude.com.utils.PermissionsUtils
+import h_mal.appttude.com.driver.application.ApplicationViewModelFactory
+import h_mal.appttude.com.driver.data.ViewState
+import h_mal.appttude.com.driver.utils.PermissionsUtils
 import org.kodein.di.KodeinAware
 import org.kodein.di.android.x.kodein
 import org.kodein.di.generic.instance
diff --git a/app/src/main/java/h_mal/appttude/com/base/BaseViewModel.kt b/app/src/main/java/h_mal/appttude/com/driver/base/BaseViewModel.kt
similarity index 87%
rename from app/src/main/java/h_mal/appttude/com/base/BaseViewModel.kt
rename to app/src/main/java/h_mal/appttude/com/driver/base/BaseViewModel.kt
index 274ab0b..e94fe99 100644
--- a/app/src/main/java/h_mal/appttude/com/base/BaseViewModel.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/base/BaseViewModel.kt
@@ -1,9 +1,9 @@
-package h_mal.appttude.com.base
+package h_mal.appttude.com.driver.base
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import h_mal.appttude.com.data.ViewState
-import h_mal.appttude.com.utils.Event
+import h_mal.appttude.com.driver.data.ViewState
+import h_mal.appttude.com.driver.utils.Event
 
 abstract class BaseViewModel : ViewModel() {
     open val uiState: MutableLiveData<ViewState> = MutableLiveData()
diff --git a/app/src/main/java/h_mal/appttude/com/base/DataSubmissionBaseFragment.kt b/app/src/main/java/h_mal/appttude/com/driver/base/DataSubmissionBaseFragment.kt
similarity index 88%
rename from app/src/main/java/h_mal/appttude/com/base/DataSubmissionBaseFragment.kt
rename to app/src/main/java/h_mal/appttude/com/driver/base/DataSubmissionBaseFragment.kt
index 5ead99f..5f18b90 100644
--- a/app/src/main/java/h_mal/appttude/com/base/DataSubmissionBaseFragment.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/base/DataSubmissionBaseFragment.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.base
+package h_mal.appttude.com.driver.base
 
 import android.Manifest
 import android.content.Intent
@@ -8,10 +8,10 @@ import android.view.View
 import android.widget.EditText
 import androidx.core.widget.doAfterTextChanged
 import androidx.viewbinding.ViewBinding
-import h_mal.appttude.com.data.UserAuthState
-import h_mal.appttude.com.ui.user.LoginActivity
-import h_mal.appttude.com.utils.PermissionsUtils.askForPermissions
-import h_mal.appttude.com.utils.TextValidationUtils.validateEditText
+import h_mal.appttude.com.driver.data.UserAuthState
+import h_mal.appttude.com.driver.ui.user.LoginActivity
+import h_mal.appttude.com.driver.utils.PermissionsUtils.askForPermissions
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validateEditText
 
 private const val IMAGE_PERMISSION_RESULT = 402
 
diff --git a/app/src/main/java/h_mal/appttude/com/base/DataSubmissionBaseViewModel.kt b/app/src/main/java/h_mal/appttude/com/driver/base/DataSubmissionBaseViewModel.kt
similarity index 86%
rename from app/src/main/java/h_mal/appttude/com/base/DataSubmissionBaseViewModel.kt
rename to app/src/main/java/h_mal/appttude/com/driver/base/DataSubmissionBaseViewModel.kt
index cea7e46..5e3793c 100644
--- a/app/src/main/java/h_mal/appttude/com/base/DataSubmissionBaseViewModel.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/base/DataSubmissionBaseViewModel.kt
@@ -1,15 +1,15 @@
-package h_mal.appttude.com.base
+package h_mal.appttude.com.driver.base
 
 import android.net.Uri
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseCompletion
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.utils.Coroutines.io
-import h_mal.appttude.com.utils.DateUtils.getDateTimeStamp
-import h_mal.appttude.com.utils.getDataFromDatabaseRef
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseCompletion
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.utils.Coroutines.io
+import h_mal.appttude.com.driver.utils.DateUtils.getDateTimeStamp
+import h_mal.appttude.com.driver.utils.getDataFromDatabaseRef
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
diff --git a/app/src/driver/java/h_mal/appttude/com/ui/MainActivity.kt b/app/src/main/java/h_mal/appttude/com/driver/base/DrawerActivity.kt
similarity index 59%
rename from app/src/driver/java/h_mal/appttude/com/ui/MainActivity.kt
rename to app/src/main/java/h_mal/appttude/com/driver/base/DrawerActivity.kt
index 7b49ae5..ef12248 100644
--- a/app/src/driver/java/h_mal/appttude/com/ui/MainActivity.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/base/DrawerActivity.kt
@@ -1,43 +1,54 @@
-package h_mal.appttude.com.ui
-
+package h_mal.appttude.com.driver.base
 
+import android.os.Bundle
 import android.view.MenuItem
+import androidx.appcompat.widget.Toolbar
 import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.NavController
 import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
+import androidx.viewbinding.ViewBinding
 import com.google.android.material.navigation.NavigationView
 import com.google.firebase.auth.FirebaseUser
-import h_mal.appttude.com.R
-import h_mal.appttude.com.base.BaseActivity
-import h_mal.appttude.com.databinding.ActivityMainBinding
-import h_mal.appttude.com.databinding.NavHeaderMainBinding
-import h_mal.appttude.com.dialogs.ExitDialog.displayExitDialog
-import h_mal.appttude.com.utils.isTrue
-import h_mal.appttude.com.utils.setGlideImage
-import h_mal.appttude.com.viewmodels.MainViewModel
+import h_mal.appttude.com.driver.databinding.NavHeaderMainBinding
+import h_mal.appttude.com.driver.dialogs.ExitDialog.displayExitDialog
+import h_mal.appttude.com.driver.utils.isTrue
+import h_mal.appttude.com.driver.utils.setGlideImage
 
-
-class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
+abstract class DrawerActivity<V : BaseViewModel, VB : ViewBinding> : BaseActivity<V, VB>(),
     NavigationView.OnNavigationItemSelectedListener {
 
+    abstract val containerId: Int
+    abstract val drawerLayoutId: Int
+    abstract val toolbarId: Int
+    abstract val navViewId:Int
+
     lateinit var navController: NavController
     lateinit var appBarConfiguration: AppBarConfiguration
 
-    override fun setupView(binding: ActivityMainBinding) = binding.run {
-        setSupportActionBar(appBarLayout.toolbar)
+    lateinit var toolbar: Toolbar
+    lateinit var drawerLayout: DrawerLayout
+    lateinit var navView: NavigationView
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        toolbar = findViewById(toolbarId)
+        drawerLayout = findViewById(drawerLayoutId)
+        navView = findViewById(navViewId)
+
+        setSupportActionBar(toolbar)
         supportActionBar?.setDisplayShowTitleEnabled(false)
-        navController = findNavController(R.id.container)
+        navController = findNavController(containerId)
 
         appBarConfiguration = AppBarConfiguration(navController.graph, drawerLayout)
         navView.setupWithNavController(navController)
         setupActionBarWithNavController(navController, appBarConfiguration)
 
-        viewModel.getUserDetails()
-        setupLogoutInDrawer()
     }
 
     override fun onSupportNavigateUp(): Boolean {
@@ -45,10 +56,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
     }
 
     override fun setTitle(title: CharSequence) {
-        applyBinding {
-            appBarLayout.toolbar.title = title
-        }
-
+        toolbar.title = title
     }
 
     override fun onBackPressed() {
@@ -56,9 +64,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
             if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
                 drawerLayout.closeDrawer(GravityCompat.START)
             } else {
-                val navHostFragment = supportFragmentManager.findFragmentById(R.id.container)
-                navHostFragment?.childFragmentManager?.backStackEntryCount?.let { it >= 1 }?.isTrue {
+                navController.backQueue.size.let { it >= 1 }.isTrue {
                     super.onBackPressed()
+                    return@applyBinding
                 }
                 displayExitDialog()
             }
@@ -84,23 +92,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
         }
     }
 
-    private fun setupLogoutInDrawer() {
-        applyBinding {
-            logout.setOnClickListener {
-                viewModel.logOut()
-            }
-        }
-    }
-
     override fun onNavigationItemSelected(item: MenuItem): Boolean {
-        // Handle navigation view item clicks here.
-        when (item.itemId) {
-            R.id.nav_user_settings -> {}
-        }
-        applyBinding {
-            drawerLayout.closeDrawer(GravityCompat.START)
-        }
-
+        drawerLayout.closeDrawer(GravityCompat.START)
         return true
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/h_mal/appttude/com/data/EventResponse.kt b/app/src/main/java/h_mal/appttude/com/driver/data/EventResponse.kt
similarity index 87%
rename from app/src/main/java/h_mal/appttude/com/data/EventResponse.kt
rename to app/src/main/java/h_mal/appttude/com/driver/data/EventResponse.kt
index 5c73313..bd88d54 100644
--- a/app/src/main/java/h_mal/appttude/com/data/EventResponse.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/data/EventResponse.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
diff --git a/app/src/main/java/h_mal/appttude/com/data/FirebaseAuthSource.kt b/app/src/main/java/h_mal/appttude/com/driver/data/FirebaseAuthSource.kt
similarity index 97%
rename from app/src/main/java/h_mal/appttude/com/data/FirebaseAuthSource.kt
rename to app/src/main/java/h_mal/appttude/com/driver/data/FirebaseAuthSource.kt
index c438059..8820572 100644
--- a/app/src/main/java/h_mal/appttude/com/data/FirebaseAuthSource.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/data/FirebaseAuthSource.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 import android.net.Uri
 import com.google.android.gms.tasks.Task
diff --git a/app/src/main/java/h_mal/appttude/com/data/FirebaseAuthStateLiveData.kt b/app/src/main/java/h_mal/appttude/com/driver/data/FirebaseAuthStateLiveData.kt
similarity index 95%
rename from app/src/main/java/h_mal/appttude/com/data/FirebaseAuthStateLiveData.kt
rename to app/src/main/java/h_mal/appttude/com/driver/data/FirebaseAuthStateLiveData.kt
index a4fe5cc..46142e3 100644
--- a/app/src/main/java/h_mal/appttude/com/data/FirebaseAuthStateLiveData.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/data/FirebaseAuthStateLiveData.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 import androidx.lifecycle.LiveData
 import com.google.firebase.auth.FirebaseAuth
diff --git a/app/src/main/java/h_mal/appttude/com/data/FirebaseAuthentication.kt b/app/src/main/java/h_mal/appttude/com/driver/data/FirebaseAuthentication.kt
similarity index 95%
rename from app/src/main/java/h_mal/appttude/com/data/FirebaseAuthentication.kt
rename to app/src/main/java/h_mal/appttude/com/driver/data/FirebaseAuthentication.kt
index db56d30..6c6938f 100644
--- a/app/src/main/java/h_mal/appttude/com/data/FirebaseAuthentication.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/data/FirebaseAuthentication.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 import android.net.Uri
 import com.google.android.gms.tasks.Task
diff --git a/app/src/main/java/h_mal/appttude/com/data/FirebaseCompletion.kt b/app/src/main/java/h_mal/appttude/com/driver/data/FirebaseCompletion.kt
similarity index 84%
rename from app/src/main/java/h_mal/appttude/com/data/FirebaseCompletion.kt
rename to app/src/main/java/h_mal/appttude/com/driver/data/FirebaseCompletion.kt
index 131142b..95f33ae 100644
--- a/app/src/main/java/h_mal/appttude/com/data/FirebaseCompletion.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/data/FirebaseCompletion.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 sealed class FirebaseCompletion {
     object Default : FirebaseCompletion()
diff --git a/app/src/main/java/h_mal/appttude/com/data/FirebaseDatabaseSource.kt b/app/src/main/java/h_mal/appttude/com/driver/data/FirebaseDatabaseSource.kt
similarity index 98%
rename from app/src/main/java/h_mal/appttude/com/data/FirebaseDatabaseSource.kt
rename to app/src/main/java/h_mal/appttude/com/driver/data/FirebaseDatabaseSource.kt
index 3d01044..9b798d2 100644
--- a/app/src/main/java/h_mal/appttude/com/data/FirebaseDatabaseSource.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/data/FirebaseDatabaseSource.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.database.FirebaseDatabase
diff --git a/app/src/main/java/h_mal/appttude/com/data/FirebaseStorageSource.kt b/app/src/main/java/h_mal/appttude/com/driver/data/FirebaseStorageSource.kt
similarity index 97%
rename from app/src/main/java/h_mal/appttude/com/data/FirebaseStorageSource.kt
rename to app/src/main/java/h_mal/appttude/com/driver/data/FirebaseStorageSource.kt
index 8608f05..dbcc00c 100644
--- a/app/src/main/java/h_mal/appttude/com/data/FirebaseStorageSource.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/data/FirebaseStorageSource.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 import android.net.Uri
 import com.google.firebase.storage.FirebaseStorage
diff --git a/app/src/main/java/h_mal/appttude/com/driver/data/Roles.kt b/app/src/main/java/h_mal/appttude/com/driver/data/Roles.kt
new file mode 100644
index 0000000..4231fee
--- /dev/null
+++ b/app/src/main/java/h_mal/appttude/com/driver/data/Roles.kt
@@ -0,0 +1,4 @@
+package h_mal.appttude.com.driver.data
+
+const val DRIVER = "driver"
+const val ADMIN = "super_user"
\ No newline at end of file
diff --git a/app/src/main/java/h_mal/appttude/com/data/UserAuthState.kt b/app/src/main/java/h_mal/appttude/com/driver/data/UserAuthState.kt
similarity index 81%
rename from app/src/main/java/h_mal/appttude/com/data/UserAuthState.kt
rename to app/src/main/java/h_mal/appttude/com/driver/data/UserAuthState.kt
index 41a9b6b..d6ad74e 100644
--- a/app/src/main/java/h_mal/appttude/com/data/UserAuthState.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/data/UserAuthState.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
 import com.google.firebase.auth.FirebaseUser
 
diff --git a/app/src/main/java/h_mal/appttude/com/data/ViewState.kt b/app/src/main/java/h_mal/appttude/com/driver/data/ViewState.kt
similarity index 68%
rename from app/src/main/java/h_mal/appttude/com/data/ViewState.kt
rename to app/src/main/java/h_mal/appttude/com/driver/data/ViewState.kt
index e8be4fa..56f22a5 100644
--- a/app/src/main/java/h_mal/appttude/com/data/ViewState.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/data/ViewState.kt
@@ -1,6 +1,6 @@
-package h_mal.appttude.com.data
+package h_mal.appttude.com.driver.data
 
-import h_mal.appttude.com.utils.Event
+import h_mal.appttude.com.driver.utils.Event
 
 
 sealed class ViewState {
diff --git a/app/src/main/java/h_mal/appttude/com/dialogs/DateDialog.kt b/app/src/main/java/h_mal/appttude/com/driver/dialogs/DateDialog.kt
similarity index 92%
rename from app/src/main/java/h_mal/appttude/com/dialogs/DateDialog.kt
rename to app/src/main/java/h_mal/appttude/com/driver/dialogs/DateDialog.kt
index 5bec251..19d195a 100644
--- a/app/src/main/java/h_mal/appttude/com/dialogs/DateDialog.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/dialogs/DateDialog.kt
@@ -1,12 +1,12 @@
-package h_mal.appttude.com.dialogs
+package h_mal.appttude.com.driver.dialogs
 
 
 import android.app.DatePickerDialog
 import android.app.DatePickerDialog.OnDateSetListener
 import android.icu.util.Calendar
 import android.widget.EditText
-import h_mal.appttude.com.R
-import h_mal.appttude.com.utils.DateUtils
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.utils.DateUtils
 
 
 private const val DATE_FORMAT = "dd/MM/yyyy"
diff --git a/app/src/main/java/h_mal/appttude/com/dialogs/ExitDialog.kt b/app/src/main/java/h_mal/appttude/com/driver/dialogs/ExitDialog.kt
similarity index 86%
rename from app/src/main/java/h_mal/appttude/com/dialogs/ExitDialog.kt
rename to app/src/main/java/h_mal/appttude/com/driver/dialogs/ExitDialog.kt
index 15bda6b..1cca45c 100644
--- a/app/src/main/java/h_mal/appttude/com/dialogs/ExitDialog.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/dialogs/ExitDialog.kt
@@ -1,8 +1,8 @@
-package h_mal.appttude.com.dialogs
+package h_mal.appttude.com.driver.dialogs
 
 import android.app.Activity
 import android.app.AlertDialog
-import h_mal.appttude.com.R
+import h_mal.appttude.com.driver.R
 import kotlin.system.exitProcess
 
 object ExitDialog {
diff --git a/app/src/main/java/h_mal/appttude/com/model/DriverProfile.kt b/app/src/main/java/h_mal/appttude/com/driver/model/DriverProfile.kt
similarity index 85%
rename from app/src/main/java/h_mal/appttude/com/model/DriverProfile.kt
rename to app/src/main/java/h_mal/appttude/com/driver/model/DriverProfile.kt
index c48c2b2..eceddf3 100644
--- a/app/src/main/java/h_mal/appttude/com/model/DriverProfile.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/model/DriverProfile.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.model
+package h_mal.appttude.com.driver.model
 
 data class DriverProfile(
     var driverPic: String? = null,
diff --git a/app/src/main/java/h_mal/appttude/com/model/DriversLicense.kt b/app/src/main/java/h_mal/appttude/com/driver/model/DriversLicense.kt
similarity index 78%
rename from app/src/main/java/h_mal/appttude/com/model/DriversLicense.kt
rename to app/src/main/java/h_mal/appttude/com/driver/model/DriversLicense.kt
index 6ef594b..bbebc73 100644
--- a/app/src/main/java/h_mal/appttude/com/model/DriversLicense.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/model/DriversLicense.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.model
+package h_mal.appttude.com.driver.model
 
 
 data class DriversLicense(
diff --git a/app/src/main/java/h_mal/appttude/com/model/Insurance.kt b/app/src/main/java/h_mal/appttude/com/driver/model/Insurance.kt
similarity index 78%
rename from app/src/main/java/h_mal/appttude/com/model/Insurance.kt
rename to app/src/main/java/h_mal/appttude/com/driver/model/Insurance.kt
index d418585..117f69d 100644
--- a/app/src/main/java/h_mal/appttude/com/model/Insurance.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/model/Insurance.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.model
+package h_mal.appttude.com.driver.model
 
 data class Insurance(
     var photoStrings: MutableList<String?>? = null,
diff --git a/app/src/main/java/h_mal/appttude/com/model/Logbook.kt b/app/src/main/java/h_mal/appttude/com/driver/model/Logbook.kt
similarity index 70%
rename from app/src/main/java/h_mal/appttude/com/model/Logbook.kt
rename to app/src/main/java/h_mal/appttude/com/driver/model/Logbook.kt
index 73f0904..783404d 100644
--- a/app/src/main/java/h_mal/appttude/com/model/Logbook.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/model/Logbook.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.model
+package h_mal.appttude.com.driver.model
 
 
 data class Logbook(
diff --git a/app/src/main/java/h_mal/appttude/com/model/Mot.kt b/app/src/main/java/h_mal/appttude/com/driver/model/Mot.kt
similarity index 69%
rename from app/src/main/java/h_mal/appttude/com/model/Mot.kt
rename to app/src/main/java/h_mal/appttude/com/driver/model/Mot.kt
index fcf519d..4972e3c 100644
--- a/app/src/main/java/h_mal/appttude/com/model/Mot.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/model/Mot.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.model
+package h_mal.appttude.com.driver.model
 
 
 data class Mot(
diff --git a/app/src/main/java/h_mal/appttude/com/model/PrivateHireLicense.kt b/app/src/main/java/h_mal/appttude/com/driver/model/PrivateHireLicense.kt
similarity index 77%
rename from app/src/main/java/h_mal/appttude/com/model/PrivateHireLicense.kt
rename to app/src/main/java/h_mal/appttude/com/driver/model/PrivateHireLicense.kt
index 11b554a..9500840 100644
--- a/app/src/main/java/h_mal/appttude/com/model/PrivateHireLicense.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/model/PrivateHireLicense.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.model
+package h_mal.appttude.com.driver.model
 
 
 data class PrivateHireLicense(
diff --git a/app/src/main/java/h_mal/appttude/com/model/PrivateHireVehicle.kt b/app/src/main/java/h_mal/appttude/com/driver/model/PrivateHireVehicle.kt
similarity index 77%
rename from app/src/main/java/h_mal/appttude/com/model/PrivateHireVehicle.kt
rename to app/src/main/java/h_mal/appttude/com/driver/model/PrivateHireVehicle.kt
index 0da565f..708087a 100644
--- a/app/src/main/java/h_mal/appttude/com/model/PrivateHireVehicle.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/model/PrivateHireVehicle.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.model
+package h_mal.appttude.com.driver.model
 
 
 class PrivateHireVehicle(
diff --git a/app/src/main/java/h_mal/appttude/com/model/VehicleProfile.kt b/app/src/main/java/h_mal/appttude/com/driver/model/VehicleProfile.kt
similarity index 89%
rename from app/src/main/java/h_mal/appttude/com/model/VehicleProfile.kt
rename to app/src/main/java/h_mal/appttude/com/driver/model/VehicleProfile.kt
index e5fa101..59ec3c0 100644
--- a/app/src/main/java/h_mal/appttude/com/model/VehicleProfile.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/model/VehicleProfile.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.model
+package h_mal.appttude.com.driver.model
 
 
 data class VehicleProfile(
diff --git a/app/src/main/java/h_mal/appttude/com/ui/.idea/.gitignore b/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/.gitignore
similarity index 100%
rename from app/src/main/java/h_mal/appttude/com/ui/.idea/.gitignore
rename to app/src/main/java/h_mal/appttude/com/driver/ui/.idea/.gitignore
diff --git a/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/dictionaries b/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/dictionaries
new file mode 100644
index 0000000..ed3680a
--- /dev/null
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/dictionaries
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectDictionaryState">
+    <dictionary name="h_mal" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/kotlinc.xml b/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/kotlinc.xml
new file mode 100644
index 0000000..8b7f4af
--- /dev/null
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="sourceMapEmbedSources" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/misc.xml b/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/misc.xml
new file mode 100644
index 0000000..51300e5
--- /dev/null
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/misc.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeSettings">
+    <configurations>
+      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
+    </configurations>
+  </component>
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/modules.xml b/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/modules.xml
new file mode 100644
index 0000000..f16767d
--- /dev/null
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/ui.iml" filepath="$PROJECT_DIR$/ui.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/vcs.xml b/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/vcs.xml
new file mode 100644
index 0000000..07117e4
--- /dev/null
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../../../../../../.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/h_mal/appttude/com/ui/update/DeleteProfileFragment.kt b/app/src/main/java/h_mal/appttude/com/driver/ui/update/DeleteProfileFragment.kt
similarity index 61%
rename from app/src/main/java/h_mal/appttude/com/ui/update/DeleteProfileFragment.kt
rename to app/src/main/java/h_mal/appttude/com/driver/ui/update/DeleteProfileFragment.kt
index 545141d..1402ff2 100644
--- a/app/src/main/java/h_mal/appttude/com/ui/update/DeleteProfileFragment.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/update/DeleteProfileFragment.kt
@@ -1,10 +1,10 @@
-package h_mal.appttude.com.ui.update
+package h_mal.appttude.com.driver.ui.update
 
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.FragmentDeleteProfileBinding
-import h_mal.appttude.com.utils.TextValidationUtils.validatePasswordEditText
-import h_mal.appttude.com.utils.setEnterPressedListener
-import h_mal.appttude.com.viewmodels.UpdateUserViewModel
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentDeleteProfileBinding
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validatePasswordEditText
+import h_mal.appttude.com.driver.utils.setEnterPressedListener
+import h_mal.appttude.com.driver.viewmodels.UpdateUserViewModel
 
 
 class DeleteProfileFragment :
diff --git a/app/src/main/java/h_mal/appttude/com/driver/ui/update/UpdateActivity.kt b/app/src/main/java/h_mal/appttude/com/driver/ui/update/UpdateActivity.kt
new file mode 100644
index 0000000..71d6691
--- /dev/null
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/update/UpdateActivity.kt
@@ -0,0 +1,17 @@
+package h_mal.appttude.com.driver.ui.update
+
+import h_mal.appttude.com.driver.base.BaseActivity
+import h_mal.appttude.com.driver.data.FirebaseCompletion
+import h_mal.appttude.com.driver.databinding.UpdateActivityBinding
+import h_mal.appttude.com.driver.utils.displayToast
+import h_mal.appttude.com.driver.viewmodels.UpdateUserViewModel
+
+class UpdateActivity : BaseActivity<UpdateUserViewModel, UpdateActivityBinding>() {
+
+    override fun onSuccess(data: Any?) {
+        super.onSuccess(data)
+        when (data) {
+            is FirebaseCompletion.Changed -> displayToast(data.message)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/h_mal/appttude/com/ui/update/UpdateEmailFragment.kt b/app/src/main/java/h_mal/appttude/com/driver/ui/update/UpdateEmailFragment.kt
similarity index 61%
rename from app/src/main/java/h_mal/appttude/com/ui/update/UpdateEmailFragment.kt
rename to app/src/main/java/h_mal/appttude/com/driver/ui/update/UpdateEmailFragment.kt
index 020edc8..c0e1ef2 100644
--- a/app/src/main/java/h_mal/appttude/com/ui/update/UpdateEmailFragment.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/update/UpdateEmailFragment.kt
@@ -1,11 +1,11 @@
-package h_mal.appttude.com.ui.update
+package h_mal.appttude.com.driver.ui.update
 
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.FragmentUpdateEmailBinding
-import h_mal.appttude.com.utils.TextValidationUtils.validateEmailEditText
-import h_mal.appttude.com.utils.TextValidationUtils.validatePasswordEditText
-import h_mal.appttude.com.utils.setEnterPressedListener
-import h_mal.appttude.com.viewmodels.UpdateUserViewModel
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentUpdateEmailBinding
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validateEmailEditText
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validatePasswordEditText
+import h_mal.appttude.com.driver.utils.setEnterPressedListener
+import h_mal.appttude.com.driver.viewmodels.UpdateUserViewModel
 
 
 class UpdateEmailFragment : BaseFragment<UpdateUserViewModel, FragmentUpdateEmailBinding>() {
diff --git a/app/src/main/java/h_mal/appttude/com/ui/update/UpdateOverviewFragment.kt b/app/src/main/java/h_mal/appttude/com/driver/ui/update/UpdateOverviewFragment.kt
similarity index 75%
rename from app/src/main/java/h_mal/appttude/com/ui/update/UpdateOverviewFragment.kt
rename to app/src/main/java/h_mal/appttude/com/driver/ui/update/UpdateOverviewFragment.kt
index 9d39319..f9cc0c7 100644
--- a/app/src/main/java/h_mal/appttude/com/ui/update/UpdateOverviewFragment.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/update/UpdateOverviewFragment.kt
@@ -1,11 +1,11 @@
-package h_mal.appttude.com.ui.update
+package h_mal.appttude.com.driver.ui.update
 
 import android.view.View
-import h_mal.appttude.com.R
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.UpdateOverviewFragmentBinding
-import h_mal.appttude.com.utils.navigateTo
-import h_mal.appttude.com.viewmodels.UpdateUserViewModel
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.UpdateOverviewFragmentBinding
+import h_mal.appttude.com.driver.utils.navigateTo
+import h_mal.appttude.com.driver.viewmodels.UpdateUserViewModel
 
 class UpdateOverviewFragment : BaseFragment<UpdateUserViewModel, UpdateOverviewFragmentBinding>(),
     View.OnClickListener {
diff --git a/app/src/main/java/h_mal/appttude/com/ui/update/UpdatePasswordFragment.kt b/app/src/main/java/h_mal/appttude/com/driver/ui/update/UpdatePasswordFragment.kt
similarity index 62%
rename from app/src/main/java/h_mal/appttude/com/ui/update/UpdatePasswordFragment.kt
rename to app/src/main/java/h_mal/appttude/com/driver/ui/update/UpdatePasswordFragment.kt
index 63970b3..37b15c2 100644
--- a/app/src/main/java/h_mal/appttude/com/ui/update/UpdatePasswordFragment.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/update/UpdatePasswordFragment.kt
@@ -1,11 +1,11 @@
-package h_mal.appttude.com.ui.update
+package h_mal.appttude.com.driver.ui.update
 
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.FragmentUpdatePasswordBinding
-import h_mal.appttude.com.utils.TextValidationUtils.validateEmailEditText
-import h_mal.appttude.com.utils.TextValidationUtils.validatePasswordEditText
-import h_mal.appttude.com.utils.setEnterPressedListener
-import h_mal.appttude.com.viewmodels.UpdateUserViewModel
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentUpdatePasswordBinding
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validateEmailEditText
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validatePasswordEditText
+import h_mal.appttude.com.driver.utils.setEnterPressedListener
+import h_mal.appttude.com.driver.viewmodels.UpdateUserViewModel
 
 
 class UpdatePasswordFragment : BaseFragment<UpdateUserViewModel, FragmentUpdatePasswordBinding>() {
diff --git a/app/src/main/java/h_mal/appttude/com/ui/update/UpdateProfileFragment.kt b/app/src/main/java/h_mal/appttude/com/driver/ui/update/UpdateProfileFragment.kt
similarity index 85%
rename from app/src/main/java/h_mal/appttude/com/ui/update/UpdateProfileFragment.kt
rename to app/src/main/java/h_mal/appttude/com/driver/ui/update/UpdateProfileFragment.kt
index 6f71e78..b80f58a 100644
--- a/app/src/main/java/h_mal/appttude/com/ui/update/UpdateProfileFragment.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/update/UpdateProfileFragment.kt
@@ -1,15 +1,15 @@
-package h_mal.appttude.com.ui.update
+package h_mal.appttude.com.driver.ui.update
 
 import android.Manifest.permission.READ_EXTERNAL_STORAGE
 import android.net.Uri
 import androidx.core.widget.doAfterTextChanged
 import com.google.firebase.auth.FirebaseUser
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.FragmentUpdateProfileBinding
-import h_mal.appttude.com.utils.PermissionsUtils.askForPermissions
-import h_mal.appttude.com.utils.setEnterPressedListener
-import h_mal.appttude.com.utils.setGlideImage
-import h_mal.appttude.com.viewmodels.UpdateUserViewModel
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentUpdateProfileBinding
+import h_mal.appttude.com.driver.utils.PermissionsUtils.askForPermissions
+import h_mal.appttude.com.driver.utils.setEnterPressedListener
+import h_mal.appttude.com.driver.utils.setGlideImage
+import h_mal.appttude.com.driver.viewmodels.UpdateUserViewModel
 
 const val TAG_CONST = "non-user"
 private const val IMAGE_PERMISSION_RESULT = 402
diff --git a/app/src/main/java/h_mal/appttude/com/ui/user/ForgotPasswordFragment.kt b/app/src/main/java/h_mal/appttude/com/driver/ui/user/ForgotPasswordFragment.kt
similarity index 55%
rename from app/src/main/java/h_mal/appttude/com/ui/user/ForgotPasswordFragment.kt
rename to app/src/main/java/h_mal/appttude/com/driver/ui/user/ForgotPasswordFragment.kt
index 7d458ed..0cb77a2 100644
--- a/app/src/main/java/h_mal/appttude/com/ui/user/ForgotPasswordFragment.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/user/ForgotPasswordFragment.kt
@@ -1,9 +1,9 @@
-package h_mal.appttude.com.ui.user
+package h_mal.appttude.com.driver.ui.user
 
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.FragmentForgotPasswordBinding
-import h_mal.appttude.com.utils.TextValidationUtils.validateEmailEditText
-import h_mal.appttude.com.viewmodels.UserViewModel
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentForgotPasswordBinding
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validateEmailEditText
+import h_mal.appttude.com.driver.viewmodels.UserViewModel
 
 
 class ForgotPasswordFragment : BaseFragment<UserViewModel, FragmentForgotPasswordBinding>() {
diff --git a/app/src/main/java/h_mal/appttude/com/ui/user/LoginActivity.kt b/app/src/main/java/h_mal/appttude/com/driver/ui/user/LoginActivity.kt
similarity index 69%
rename from app/src/main/java/h_mal/appttude/com/ui/user/LoginActivity.kt
rename to app/src/main/java/h_mal/appttude/com/driver/ui/user/LoginActivity.kt
index 32f8249..ebd840f 100644
--- a/app/src/main/java/h_mal/appttude/com/ui/user/LoginActivity.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/user/LoginActivity.kt
@@ -1,13 +1,13 @@
-package h_mal.appttude.com.ui.user
+package h_mal.appttude.com.driver.ui.user
 
 
 import android.content.Intent
 import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.FirebaseUser
-import h_mal.appttude.com.base.BaseActivity
-import h_mal.appttude.com.databinding.ActivityLoginBinding
-import h_mal.appttude.com.ui.MainActivity
-import h_mal.appttude.com.viewmodels.UserViewModel
+import h_mal.appttude.com.driver.base.BaseActivity
+import h_mal.appttude.com.driver.databinding.ActivityLoginBinding
+import h_mal.appttude.com.driver.ui.MainActivity
+import h_mal.appttude.com.driver.viewmodels.UserViewModel
 
 
 /**
diff --git a/app/src/main/java/h_mal/appttude/com/ui/user/LoginFragment.kt b/app/src/main/java/h_mal/appttude/com/driver/ui/user/LoginFragment.kt
similarity index 61%
rename from app/src/main/java/h_mal/appttude/com/ui/user/LoginFragment.kt
rename to app/src/main/java/h_mal/appttude/com/driver/ui/user/LoginFragment.kt
index 551514d..cd59009 100644
--- a/app/src/main/java/h_mal/appttude/com/ui/user/LoginFragment.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/user/LoginFragment.kt
@@ -1,13 +1,13 @@
-package h_mal.appttude.com.ui.user
+package h_mal.appttude.com.driver.ui.user
 
-import h_mal.appttude.com.R
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.FragmentLoginBinding
-import h_mal.appttude.com.utils.TextValidationUtils.validateEmailEditText
-import h_mal.appttude.com.utils.TextValidationUtils.validatePasswordEditText
-import h_mal.appttude.com.utils.navigateTo
-import h_mal.appttude.com.utils.setEnterPressedListener
-import h_mal.appttude.com.viewmodels.UserViewModel
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentLoginBinding
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validateEmailEditText
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validatePasswordEditText
+import h_mal.appttude.com.driver.utils.navigateTo
+import h_mal.appttude.com.driver.utils.setEnterPressedListener
+import h_mal.appttude.com.driver.viewmodels.UserViewModel
 
 class LoginFragment : BaseFragment<UserViewModel, FragmentLoginBinding>() {
 
diff --git a/app/src/main/java/h_mal/appttude/com/ui/user/RegisterFragment.kt b/app/src/main/java/h_mal/appttude/com/driver/ui/user/RegisterFragment.kt
similarity index 68%
rename from app/src/main/java/h_mal/appttude/com/ui/user/RegisterFragment.kt
rename to app/src/main/java/h_mal/appttude/com/driver/ui/user/RegisterFragment.kt
index dd98732..38be47d 100644
--- a/app/src/main/java/h_mal/appttude/com/ui/user/RegisterFragment.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/user/RegisterFragment.kt
@@ -1,12 +1,12 @@
-package h_mal.appttude.com.ui.user
+package h_mal.appttude.com.driver.ui.user
 
-import h_mal.appttude.com.R
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.databinding.FragmentRegisterBinding
-import h_mal.appttude.com.utils.TextValidationUtils.validateEmailEditText
-import h_mal.appttude.com.utils.TextValidationUtils.validatePasswordEditText
-import h_mal.appttude.com.utils.setEnterPressedListener
-import h_mal.appttude.com.viewmodels.UserViewModel
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.databinding.FragmentRegisterBinding
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validateEmailEditText
+import h_mal.appttude.com.driver.utils.TextValidationUtils.validatePasswordEditText
+import h_mal.appttude.com.driver.utils.setEnterPressedListener
+import h_mal.appttude.com.driver.viewmodels.UserViewModel
 
 class RegisterFragment :
     BaseFragment<UserViewModel, FragmentRegisterBinding>() {
diff --git a/app/src/main/java/h_mal/appttude/com/ui/user/SplashScreenFragment.kt b/app/src/main/java/h_mal/appttude/com/driver/ui/user/SplashScreenFragment.kt
similarity index 57%
rename from app/src/main/java/h_mal/appttude/com/ui/user/SplashScreenFragment.kt
rename to app/src/main/java/h_mal/appttude/com/driver/ui/user/SplashScreenFragment.kt
index cb4b696..04f11b9 100644
--- a/app/src/main/java/h_mal/appttude/com/ui/user/SplashScreenFragment.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/ui/user/SplashScreenFragment.kt
@@ -1,13 +1,13 @@
-package h_mal.appttude.com.ui.user
+package h_mal.appttude.com.driver.ui.user
 
 import android.os.Bundle
 import android.view.View
-import h_mal.appttude.com.R
-import h_mal.appttude.com.base.BaseFragment
-import h_mal.appttude.com.data.FirebaseCompletion
-import h_mal.appttude.com.databinding.SplashScreenBinding
-import h_mal.appttude.com.utils.navigateTo
-import h_mal.appttude.com.viewmodels.UserViewModel
+import h_mal.appttude.com.driver.R
+import h_mal.appttude.com.driver.base.BaseFragment
+import h_mal.appttude.com.driver.data.FirebaseCompletion
+import h_mal.appttude.com.driver.databinding.SplashScreenBinding
+import h_mal.appttude.com.driver.utils.navigateTo
+import h_mal.appttude.com.driver.viewmodels.UserViewModel
 
 
 class SplashScreenFragment : BaseFragment<UserViewModel, SplashScreenBinding>() {
diff --git a/app/src/main/java/h_mal/appttude/com/utils/ActivityIntentBuilder.kt b/app/src/main/java/h_mal/appttude/com/driver/utils/ActivityIntentBuilder.kt
similarity index 91%
rename from app/src/main/java/h_mal/appttude/com/utils/ActivityIntentBuilder.kt
rename to app/src/main/java/h_mal/appttude/com/driver/utils/ActivityIntentBuilder.kt
index 9e11ff9..0da57af 100644
--- a/app/src/main/java/h_mal/appttude/com/utils/ActivityIntentBuilder.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/utils/ActivityIntentBuilder.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import android.content.Context
 import android.content.Intent
diff --git a/app/src/main/java/h_mal/appttude/com/utils/AnimationUtils.kt b/app/src/main/java/h_mal/appttude/com/driver/utils/AnimationUtils.kt
similarity index 93%
rename from app/src/main/java/h_mal/appttude/com/utils/AnimationUtils.kt
rename to app/src/main/java/h_mal/appttude/com/driver/utils/AnimationUtils.kt
index e092c30..0eecc1c 100644
--- a/app/src/main/java/h_mal/appttude/com/utils/AnimationUtils.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/utils/AnimationUtils.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import android.view.View
 import android.view.animation.Animation
diff --git a/app/src/main/java/h_mal/appttude/com/utils/BasicIdlingResource.kt b/app/src/main/java/h_mal/appttude/com/driver/utils/BasicIdlingResource.kt
similarity index 95%
rename from app/src/main/java/h_mal/appttude/com/utils/BasicIdlingResource.kt
rename to app/src/main/java/h_mal/appttude/com/driver/utils/BasicIdlingResource.kt
index c28065f..c305132 100644
--- a/app/src/main/java/h_mal/appttude/com/utils/BasicIdlingResource.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/utils/BasicIdlingResource.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import androidx.test.espresso.IdlingResource
 import androidx.test.espresso.IdlingResource.ResourceCallback
diff --git a/app/src/main/java/h_mal/appttude/com/utils/Coroutines.kt b/app/src/main/java/h_mal/appttude/com/driver/utils/Coroutines.kt
similarity index 90%
rename from app/src/main/java/h_mal/appttude/com/utils/Coroutines.kt
rename to app/src/main/java/h_mal/appttude/com/driver/utils/Coroutines.kt
index 6ee55dd..8065d93 100644
--- a/app/src/main/java/h_mal/appttude/com/utils/Coroutines.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/utils/Coroutines.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/h_mal/appttude/com/utils/DateUtils.kt b/app/src/main/java/h_mal/appttude/com/driver/utils/DateUtils.kt
similarity index 97%
rename from app/src/main/java/h_mal/appttude/com/utils/DateUtils.kt
rename to app/src/main/java/h_mal/appttude/com/driver/utils/DateUtils.kt
index d2fa568..ed2d5bd 100644
--- a/app/src/main/java/h_mal/appttude/com/utils/DateUtils.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/utils/DateUtils.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import android.icu.util.Calendar
 import java.text.ParseException
diff --git a/app/src/main/java/h_mal/appttude/com/utils/Extensions.kt b/app/src/main/java/h_mal/appttude/com/driver/utils/Extensions.kt
similarity index 84%
rename from app/src/main/java/h_mal/appttude/com/utils/Extensions.kt
rename to app/src/main/java/h_mal/appttude/com/driver/utils/Extensions.kt
index 0f94d5e..d509275 100644
--- a/app/src/main/java/h_mal/appttude/com/utils/Extensions.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/utils/Extensions.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 
 inline fun Boolean.isTrue(block: () -> Unit){
diff --git a/app/src/main/java/h_mal/appttude/com/utils/FirebaseUtils.kt b/app/src/main/java/h_mal/appttude/com/driver/utils/FirebaseUtils.kt
similarity index 93%
rename from app/src/main/java/h_mal/appttude/com/utils/FirebaseUtils.kt
rename to app/src/main/java/h_mal/appttude/com/driver/utils/FirebaseUtils.kt
index 2b333c4..98d7b9a 100644
--- a/app/src/main/java/h_mal/appttude/com/utils/FirebaseUtils.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/utils/FirebaseUtils.kt
@@ -1,10 +1,10 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.database.ValueEventListener
-import h_mal.appttude.com.data.EventResponse
+import h_mal.appttude.com.driver.data.EventResponse
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
diff --git a/app/src/main/java/h_mal/appttude/com/utils/LiveDataUtils.kt b/app/src/main/java/h_mal/appttude/com/driver/utils/LiveDataUtils.kt
similarity index 92%
rename from app/src/main/java/h_mal/appttude/com/utils/LiveDataUtils.kt
rename to app/src/main/java/h_mal/appttude/com/driver/utils/LiveDataUtils.kt
index 6e4d25d..eeb7640 100644
--- a/app/src/main/java/h_mal/appttude/com/utils/LiveDataUtils.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/utils/LiveDataUtils.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 
 open class Event<out T>(private val content: T) {
diff --git a/app/src/main/java/h_mal/appttude/com/utils/NavigationUtils.kt b/app/src/main/java/h_mal/appttude/com/driver/utils/NavigationUtils.kt
similarity index 94%
rename from app/src/main/java/h_mal/appttude/com/utils/NavigationUtils.kt
rename to app/src/main/java/h_mal/appttude/com/driver/utils/NavigationUtils.kt
index 102f2d1..c48adf2 100644
--- a/app/src/main/java/h_mal/appttude/com/utils/NavigationUtils.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/utils/NavigationUtils.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import android.content.Context
 import android.content.Intent
diff --git a/app/src/main/java/h_mal/appttude/com/utils/Navigations.kt b/app/src/main/java/h_mal/appttude/com/driver/utils/Navigations.kt
similarity index 63%
rename from app/src/main/java/h_mal/appttude/com/utils/Navigations.kt
rename to app/src/main/java/h_mal/appttude/com/driver/utils/Navigations.kt
index 000b29d..6f1335f 100644
--- a/app/src/main/java/h_mal/appttude/com/utils/Navigations.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/utils/Navigations.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 enum class Navigations(val value: String) {
     Main("MainActivity");
diff --git a/app/src/main/java/h_mal/appttude/com/utils/PermissionsUtils.kt b/app/src/main/java/h_mal/appttude/com/driver/utils/PermissionsUtils.kt
similarity index 98%
rename from app/src/main/java/h_mal/appttude/com/utils/PermissionsUtils.kt
rename to app/src/main/java/h_mal/appttude/com/driver/utils/PermissionsUtils.kt
index 71c9a35..32ec414 100644
--- a/app/src/main/java/h_mal/appttude/com/utils/PermissionsUtils.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/utils/PermissionsUtils.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import android.app.Activity
 import android.content.Context
diff --git a/app/src/main/java/h_mal/appttude/com/utils/TextValidationUtils.kt b/app/src/main/java/h_mal/appttude/com/driver/utils/TextValidationUtils.kt
similarity index 96%
rename from app/src/main/java/h_mal/appttude/com/utils/TextValidationUtils.kt
rename to app/src/main/java/h_mal/appttude/com/driver/utils/TextValidationUtils.kt
index b3b38d3..db97e0b 100644
--- a/app/src/main/java/h_mal/appttude/com/utils/TextValidationUtils.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/utils/TextValidationUtils.kt
@@ -1,7 +1,7 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import android.widget.EditText
-import h_mal.appttude.com.R
+import h_mal.appttude.com.driver.R
 
 
 object TextValidationUtils {
diff --git a/app/src/main/java/h_mal/appttude/com/utils/ViewUtils.kt b/app/src/main/java/h_mal/appttude/com/driver/utils/ViewUtils.kt
similarity index 96%
rename from app/src/main/java/h_mal/appttude/com/utils/ViewUtils.kt
rename to app/src/main/java/h_mal/appttude/com/driver/utils/ViewUtils.kt
index 7efeb5f..febf32d 100644
--- a/app/src/main/java/h_mal/appttude/com/utils/ViewUtils.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/utils/ViewUtils.kt
@@ -1,4 +1,4 @@
-package h_mal.appttude.com.utils
+package h_mal.appttude.com.driver.utils
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -23,7 +23,7 @@ import androidx.fragment.app.Fragment
 import com.bumptech.glide.Glide
 import com.squareup.picasso.Picasso
 import com.squareup.picasso.Target
-import h_mal.appttude.com.R
+import h_mal.appttude.com.driver.R
 
 fun View.show() {
     this.visibility = View.VISIBLE
diff --git a/app/src/main/java/h_mal/appttude/com/viewmodels/DriverLicenseViewModel.kt b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/DriverLicenseViewModel.kt
similarity index 70%
rename from app/src/main/java/h_mal/appttude/com/viewmodels/DriverLicenseViewModel.kt
rename to app/src/main/java/h_mal/appttude/com/driver/viewmodels/DriverLicenseViewModel.kt
index 3d4886d..04dadfd 100644
--- a/app/src/main/java/h_mal/appttude/com/viewmodels/DriverLicenseViewModel.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/DriverLicenseViewModel.kt
@@ -1,14 +1,14 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
 import android.net.Uri
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
-import h_mal.appttude.com.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.DriversLicense
-import h_mal.appttude.com.utils.Coroutines.io
+import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.model.DriversLicense
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class DriverLicenseViewModel(
     auth: FirebaseAuthentication,
diff --git a/app/src/main/java/h_mal/appttude/com/viewmodels/DriverProfileViewModel.kt b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/DriverProfileViewModel.kt
similarity index 70%
rename from app/src/main/java/h_mal/appttude/com/viewmodels/DriverProfileViewModel.kt
rename to app/src/main/java/h_mal/appttude/com/driver/viewmodels/DriverProfileViewModel.kt
index 0a7ed53..ee6514c 100644
--- a/app/src/main/java/h_mal/appttude/com/viewmodels/DriverProfileViewModel.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/DriverProfileViewModel.kt
@@ -1,14 +1,14 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
 import android.net.Uri
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
-import h_mal.appttude.com.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.DriverProfile
-import h_mal.appttude.com.utils.Coroutines.io
+import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.model.DriverProfile
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class DriverProfileViewModel(
     auth: FirebaseAuthentication,
diff --git a/app/src/main/java/h_mal/appttude/com/viewmodels/InsuranceViewModel.kt b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/InsuranceViewModel.kt
similarity index 75%
rename from app/src/main/java/h_mal/appttude/com/viewmodels/InsuranceViewModel.kt
rename to app/src/main/java/h_mal/appttude/com/driver/viewmodels/InsuranceViewModel.kt
index 3717f14..dff3c6c 100644
--- a/app/src/main/java/h_mal/appttude/com/viewmodels/InsuranceViewModel.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/InsuranceViewModel.kt
@@ -1,14 +1,14 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
 import android.net.Uri
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
-import h_mal.appttude.com.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.Insurance
-import h_mal.appttude.com.utils.Coroutines.io
+import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.model.Insurance
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class InsuranceViewModel(
     auth: FirebaseAuthentication,
diff --git a/app/src/main/java/h_mal/appttude/com/viewmodels/LogbookViewModel.kt b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/LogbookViewModel.kt
similarity index 69%
rename from app/src/main/java/h_mal/appttude/com/viewmodels/LogbookViewModel.kt
rename to app/src/main/java/h_mal/appttude/com/driver/viewmodels/LogbookViewModel.kt
index 09d89be..5f2dd43 100644
--- a/app/src/main/java/h_mal/appttude/com/viewmodels/LogbookViewModel.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/LogbookViewModel.kt
@@ -1,14 +1,14 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
 import android.net.Uri
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
-import h_mal.appttude.com.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.Logbook
-import h_mal.appttude.com.utils.Coroutines.io
+import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.model.Logbook
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class LogbookViewModel(
     auth: FirebaseAuthentication,
diff --git a/app/src/main/java/h_mal/appttude/com/viewmodels/MainViewModel.kt b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/MainViewModel.kt
similarity index 66%
rename from app/src/main/java/h_mal/appttude/com/viewmodels/MainViewModel.kt
rename to app/src/main/java/h_mal/appttude/com/driver/viewmodels/MainViewModel.kt
index 4099f72..0924c8d 100644
--- a/app/src/main/java/h_mal/appttude/com/viewmodels/MainViewModel.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/MainViewModel.kt
@@ -1,10 +1,10 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
-import h_mal.appttude.com.base.BaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.utils.Coroutines.io
-import h_mal.appttude.com.utils.getDataFromDatabaseRef
+import h_mal.appttude.com.driver.base.BaseViewModel
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.utils.Coroutines.io
+import h_mal.appttude.com.driver.utils.getDataFromDatabaseRef
 
 class MainViewModel(
     private val firebaseAuth: FirebaseAuthentication,
diff --git a/app/src/main/java/h_mal/appttude/com/viewmodels/MotViewModel.kt b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/MotViewModel.kt
similarity index 69%
rename from app/src/main/java/h_mal/appttude/com/viewmodels/MotViewModel.kt
rename to app/src/main/java/h_mal/appttude/com/driver/viewmodels/MotViewModel.kt
index c9c86fb..ac932af 100644
--- a/app/src/main/java/h_mal/appttude/com/viewmodels/MotViewModel.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/MotViewModel.kt
@@ -1,14 +1,14 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
 import android.net.Uri
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
-import h_mal.appttude.com.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.Mot
-import h_mal.appttude.com.utils.Coroutines.io
+import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.model.Mot
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class MotViewModel(
     auth: FirebaseAuthentication,
diff --git a/app/src/main/java/h_mal/appttude/com/viewmodels/PrivateHireLicenseViewModel.kt b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/PrivateHireLicenseViewModel.kt
similarity index 73%
rename from app/src/main/java/h_mal/appttude/com/viewmodels/PrivateHireLicenseViewModel.kt
rename to app/src/main/java/h_mal/appttude/com/driver/viewmodels/PrivateHireLicenseViewModel.kt
index a6dfb23..0f502b3 100644
--- a/app/src/main/java/h_mal/appttude/com/viewmodels/PrivateHireLicenseViewModel.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/PrivateHireLicenseViewModel.kt
@@ -1,14 +1,14 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
 import android.net.Uri
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
-import h_mal.appttude.com.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.PrivateHireLicense
-import h_mal.appttude.com.utils.Coroutines.io
+import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.model.PrivateHireLicense
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class PrivateHireLicenseViewModel(
     auth: FirebaseAuthentication,
diff --git a/app/src/main/java/h_mal/appttude/com/viewmodels/PrivateHireVehicleViewModel.kt b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/PrivateHireVehicleViewModel.kt
similarity index 71%
rename from app/src/main/java/h_mal/appttude/com/viewmodels/PrivateHireVehicleViewModel.kt
rename to app/src/main/java/h_mal/appttude/com/driver/viewmodels/PrivateHireVehicleViewModel.kt
index df4a870..e4bf9be 100644
--- a/app/src/main/java/h_mal/appttude/com/viewmodels/PrivateHireVehicleViewModel.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/PrivateHireVehicleViewModel.kt
@@ -1,14 +1,14 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
 import android.net.Uri
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
-import h_mal.appttude.com.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.PrivateHireVehicle
-import h_mal.appttude.com.utils.Coroutines.io
+import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.model.PrivateHireVehicle
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class PrivateHireVehicleViewModel(
     auth: FirebaseAuthentication,
diff --git a/app/src/main/java/h_mal/appttude/com/viewmodels/RoleViewModel.kt b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/RoleViewModel.kt
similarity index 68%
rename from app/src/main/java/h_mal/appttude/com/viewmodels/RoleViewModel.kt
rename to app/src/main/java/h_mal/appttude/com/driver/viewmodels/RoleViewModel.kt
index 789b10a..3e3f6df 100644
--- a/app/src/main/java/h_mal/appttude/com/viewmodels/RoleViewModel.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/RoleViewModel.kt
@@ -1,12 +1,12 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
-import h_mal.appttude.com.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.utils.Coroutines.io
+import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class RoleViewModel(
     auth: FirebaseAuthentication,
diff --git a/app/src/main/java/h_mal/appttude/com/viewmodels/UpdateUserViewModel.kt b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/UpdateUserViewModel.kt
similarity index 86%
rename from app/src/main/java/h_mal/appttude/com/viewmodels/UpdateUserViewModel.kt
rename to app/src/main/java/h_mal/appttude/com/driver/viewmodels/UpdateUserViewModel.kt
index 4787bb9..df23493 100644
--- a/app/src/main/java/h_mal/appttude/com/viewmodels/UpdateUserViewModel.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/UpdateUserViewModel.kt
@@ -1,11 +1,11 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
 import android.net.Uri
-import h_mal.appttude.com.base.BaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseCompletion
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.utils.Coroutines.io
+import h_mal.appttude.com.driver.base.BaseViewModel
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseCompletion
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.utils.Coroutines.io
 import kotlinx.coroutines.tasks.await
 
 class UpdateUserViewModel(
diff --git a/app/src/main/java/h_mal/appttude/com/viewmodels/UserViewModel.kt b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/UserViewModel.kt
similarity index 81%
rename from app/src/main/java/h_mal/appttude/com/viewmodels/UserViewModel.kt
rename to app/src/main/java/h_mal/appttude/com/driver/viewmodels/UserViewModel.kt
index 5170ee1..701ad56 100644
--- a/app/src/main/java/h_mal/appttude/com/viewmodels/UserViewModel.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/UserViewModel.kt
@@ -1,10 +1,10 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
 import com.google.firebase.auth.AuthResult
-import h_mal.appttude.com.base.BaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseCompletion
-import h_mal.appttude.com.utils.Coroutines.io
+import h_mal.appttude.com.driver.base.BaseViewModel
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseCompletion
+import h_mal.appttude.com.driver.utils.Coroutines.io
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.tasks.await
 
diff --git a/app/src/main/java/h_mal/appttude/com/viewmodels/VehicleProfileViewModel.kt b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/VehicleProfileViewModel.kt
similarity index 66%
rename from app/src/main/java/h_mal/appttude/com/viewmodels/VehicleProfileViewModel.kt
rename to app/src/main/java/h_mal/appttude/com/driver/viewmodels/VehicleProfileViewModel.kt
index 4bb4036..0be90ed8 100644
--- a/app/src/main/java/h_mal/appttude/com/viewmodels/VehicleProfileViewModel.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/viewmodels/VehicleProfileViewModel.kt
@@ -1,13 +1,13 @@
-package h_mal.appttude.com.viewmodels
+package h_mal.appttude.com.driver.viewmodels
 
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.storage.StorageReference
-import h_mal.appttude.com.base.DataSubmissionBaseViewModel
-import h_mal.appttude.com.data.FirebaseAuthentication
-import h_mal.appttude.com.data.FirebaseDatabaseSource
-import h_mal.appttude.com.data.FirebaseStorageSource
-import h_mal.appttude.com.model.VehicleProfile
-import h_mal.appttude.com.utils.Coroutines.io
+import h_mal.appttude.com.driver.base.DataSubmissionBaseViewModel
+import h_mal.appttude.com.driver.data.FirebaseAuthentication
+import h_mal.appttude.com.driver.data.FirebaseDatabaseSource
+import h_mal.appttude.com.driver.data.FirebaseStorageSource
+import h_mal.appttude.com.driver.model.VehicleProfile
+import h_mal.appttude.com.driver.utils.Coroutines.io
 
 class VehicleProfileViewModel(
     auth: FirebaseAuthentication,
diff --git a/app/src/main/java/h_mal/appttude/com/ui/update/UpdateActivity.kt b/app/src/main/java/h_mal/appttude/com/ui/update/UpdateActivity.kt
deleted file mode 100644
index 3b2dc7f..0000000
--- a/app/src/main/java/h_mal/appttude/com/ui/update/UpdateActivity.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package h_mal.appttude.com.ui.update
-
-import h_mal.appttude.com.base.BaseActivity
-import h_mal.appttude.com.data.FirebaseCompletion
-import h_mal.appttude.com.databinding.UpdateActivityBinding
-import h_mal.appttude.com.utils.displayToast
-import h_mal.appttude.com.viewmodels.UpdateUserViewModel
-
-class UpdateActivity : BaseActivity<UpdateUserViewModel, UpdateActivityBinding>() {
-
-    override fun onSuccess(data: Any?) {
-        super.onSuccess(data)
-        when (data) {
-            is FirebaseCompletion.Changed -> displayToast(data.message)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index a570d34..ab15e00 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/background_with_curve"
-    tools:context="h_mal.appttude.com.ui.user.LoginActivity">
+    tools:context="h_mal.appttude.com.driver.ui.user.LoginActivity">
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/container"
diff --git a/app/src/main/res/layout/fragment_driver_overall.xml b/app/src/main/res/layout/fragment_driver_overall.xml
index 258ab4a..c19e975 100644
--- a/app/src/main/res/layout/fragment_driver_overall.xml
+++ b/app/src/main/res/layout/fragment_driver_overall.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     style="@style/parent_constraint_layout"
-    tools:context="h_mal.appttude.com.ui.HomeFragment">
+    tools:context="h_mal.appttude.com.driver.ui.HomeFragment">
 
     <TextView
         android:id="@+id/prova_title_tv"
diff --git a/app/src/main/res/layout/fragment_home_driver.xml b/app/src/main/res/layout/fragment_home_driver.xml
index 818eb63..3ac1f30 100644
--- a/app/src/main/res/layout/fragment_home_driver.xml
+++ b/app/src/main/res/layout/fragment_home_driver.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     style="@style/parent_constraint_layout"
-    tools:context="h_mal.appttude.com.ui.HomeFragment">
+    tools:context="h_mal.appttude.com.driver.ui.HomeFragment">
 
     <ImageView
         android:id="@+id/prova_logo"
diff --git a/app/src/main/res/layout/fragment_vehicle_overall.xml b/app/src/main/res/layout/fragment_vehicle_overall.xml
index 2797720..adb41b2 100644
--- a/app/src/main/res/layout/fragment_vehicle_overall.xml
+++ b/app/src/main/res/layout/fragment_vehicle_overall.xml
@@ -9,7 +9,7 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="h_mal.appttude.com.ui.VehicleOverallFragment">
+    tools:context="h_mal.appttude.com.driver.ui.VehicleOverallFragment">
 
     <TextView
         android:id="@+id/prova_title_tv"
diff --git a/app/src/main/res/navigation/auth_navigation.xml b/app/src/main/res/navigation/auth_navigation.xml
index 76eecc9..a62d468 100644
--- a/app/src/main/res/navigation/auth_navigation.xml
+++ b/app/src/main/res/navigation/auth_navigation.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/loginFragment"
-        android:name="h_mal.appttude.com.ui.user.LoginFragment"
+        android:name="h_mal.appttude.com.driver.ui.user.LoginFragment"
         android:label="LoginFragment"
         tools:layout="@layout/fragment_login">
         <action
@@ -27,17 +27,17 @@
     </fragment>
     <fragment
         android:id="@+id/registerFragment"
-        android:name="h_mal.appttude.com.ui.user.RegisterFragment"
+        android:name="h_mal.appttude.com.driver.ui.user.RegisterFragment"
         android:label="RegisterFragment"
         tools:layout="@layout/fragment_register" />
     <fragment
         android:id="@+id/forgotPasswordFragment"
-        android:name="h_mal.appttude.com.ui.user.ForgotPasswordFragment"
+        android:name="h_mal.appttude.com.driver.ui.user.ForgotPasswordFragment"
         android:label="fragment_forgot_password"
         tools:layout="@layout/fragment_forgot_password" />
     <fragment
         android:id="@+id/splashScreenFragment"
-        android:name="h_mal.appttude.com.ui.user.SplashScreenFragment"
+        android:name="h_mal.appttude.com.driver.ui.user.SplashScreenFragment"
         android:label="fragment_splash_screen"
         tools:layout="@layout/fragment_splash_screen">
         <action
diff --git a/app/src/main/res/navigation/update_navigation.xml b/app/src/main/res/navigation/update_navigation.xml
index 8e84569..d955be1 100644
--- a/app/src/main/res/navigation/update_navigation.xml
+++ b/app/src/main/res/navigation/update_navigation.xml
@@ -6,7 +6,7 @@
 
     <fragment
         android:id="@+id/updateOverviewFragment"
-        android:name="h_mal.appttude.com.ui.update.UpdateOverviewFragment"
+        android:name="h_mal.appttude.com.driver.ui.update.UpdateOverviewFragment"
         android:label="UpdateOverviewFragment"
         tools:layout="@layout/update_overview_fragment">
         <action
@@ -40,22 +40,22 @@
     </fragment>
     <fragment
         android:id="@+id/updateEmailFragment"
-        android:name="h_mal.appttude.com.ui.update.UpdateEmailFragment"
+        android:name="h_mal.appttude.com.driver.ui.update.UpdateEmailFragment"
         android:label="UpdateEmailFragment"
         tools:layout="@layout/fragment_update_email" />
     <fragment
         android:id="@+id/updatePasswordFragment"
-        android:name="h_mal.appttude.com.ui.update.UpdatePasswordFragment"
+        android:name="h_mal.appttude.com.driver.ui.update.UpdatePasswordFragment"
         android:label="UpdatePasswordFragment"
         tools:layout="@layout/fragment_update_password" />
     <fragment
         android:id="@+id/updateProfileFragment"
-        android:name="h_mal.appttude.com.ui.update.UpdateProfileFragment"
+        android:name="h_mal.appttude.com.driver.ui.update.UpdateProfileFragment"
         android:label="fragment_update_profile"
         tools:layout="@layout/fragment_update_profile" />
     <fragment
         android:id="@+id/deleteProfileFragment"
-        android:name="h_mal.appttude.com.ui.update.DeleteProfileFragment"
+        android:name="h_mal.appttude.com.driver.ui.update.DeleteProfileFragment"
         android:label="fragment_delete_profile"
         tools:layout="@layout/fragment_delete_profile" />