diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9de5d84010..062b789003 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -42,7 +42,7 @@
         </activity>
 
         <service
-            android:name=".autofill.BitwardenAutofillService"
+            android:name=".data.autofill.BitwardenAutofillService"
             android:label="Bitwarden"
             android:permission="android.permission.BIND_AUTOFILL_SERVICE"
             android:exported="true">
diff --git a/app/src/main/java/com/x8bit/bitwarden/autofill/BitwardenAutofillService.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/BitwardenAutofillService.kt
similarity index 95%
rename from app/src/main/java/com/x8bit/bitwarden/autofill/BitwardenAutofillService.kt
rename to app/src/main/java/com/x8bit/bitwarden/data/autofill/BitwardenAutofillService.kt
index 84c278bfc3..0c92b4ad84 100644
--- a/app/src/main/java/com/x8bit/bitwarden/autofill/BitwardenAutofillService.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/BitwardenAutofillService.kt
@@ -1,4 +1,4 @@
-package com.x8bit.bitwarden.autofill
+package com.x8bit.bitwarden.data.autofill
 
 import android.os.CancellationSignal
 import android.service.autofill.AutofillService
diff --git a/app/src/test/java/com/x8bit/bitwarden/autofill/BitwardenAutofillServiceTests.kt b/app/src/test/java/com/x8bit/bitwarden/data/autofill/BitwardenAutofillServiceTests.kt
similarity index 97%
rename from app/src/test/java/com/x8bit/bitwarden/autofill/BitwardenAutofillServiceTests.kt
rename to app/src/test/java/com/x8bit/bitwarden/data/autofill/BitwardenAutofillServiceTests.kt
index e780fa3d7f..2bde8f9568 100644
--- a/app/src/test/java/com/x8bit/bitwarden/autofill/BitwardenAutofillServiceTests.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/autofill/BitwardenAutofillServiceTests.kt
@@ -1,4 +1,4 @@
-package com.x8bit.bitwarden.autofill
+package com.x8bit.bitwarden.data.autofill
 
 import android.os.CancellationSignal
 import android.service.autofill.FillCallback