diff --git a/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java b/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java
index 6b77036..71341ba 100644
--- a/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java
@@ -27,7 +27,7 @@
 import com.android.dialer.phonelookup.PhoneLookupInfo;
 import com.android.dialer.phonelookup.PhoneLookupInfo.SpamInfo;
 import com.android.dialer.spam.Spam;
-import com.android.dialer.spam.SpamStatus;
+import com.android.dialer.spam.status.SpamStatus;
 import com.android.dialer.storage.Unencrypted;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
diff --git a/java/com/android/dialer/spam/Spam.java b/java/com/android/dialer/spam/Spam.java
index 6aa69af..181a55d 100644
--- a/java/com/android/dialer/spam/Spam.java
+++ b/java/com/android/dialer/spam/Spam.java
@@ -24,6 +24,7 @@
 import com.android.dialer.logging.ContactLookupResult;
 import com.android.dialer.logging.ContactSource;
 import com.android.dialer.logging.ReportingLocation;
+import com.android.dialer.spam.status.SpamStatus;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
diff --git a/java/com/android/dialer/spam/SpamStub.java b/java/com/android/dialer/spam/SpamStub.java
index a2e7258..2789c01 100644
--- a/java/com/android/dialer/spam/SpamStub.java
+++ b/java/com/android/dialer/spam/SpamStub.java
@@ -22,6 +22,8 @@
 import com.android.dialer.logging.ContactLookupResult;
 import com.android.dialer.logging.ContactSource;
 import com.android.dialer.logging.ReportingLocation;
+import com.android.dialer.spam.status.SimpleSpamStatus;
+import com.android.dialer.spam.status.SpamStatus;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.Futures;
diff --git a/java/com/android/dialer/spam/SimpleSpamStatus.java b/java/com/android/dialer/spam/status/SimpleSpamStatus.java
similarity index 96%
rename from java/com/android/dialer/spam/SimpleSpamStatus.java
rename to java/com/android/dialer/spam/status/SimpleSpamStatus.java
index b49241c..ec28b9d 100644
--- a/java/com/android/dialer/spam/SimpleSpamStatus.java
+++ b/java/com/android/dialer/spam/status/SimpleSpamStatus.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.dialer.spam;
+package com.android.dialer.spam.status;
 
 import android.support.annotation.Nullable;
 import com.google.auto.value.AutoValue;
diff --git a/java/com/android/dialer/spam/SpamStatus.java b/java/com/android/dialer/spam/status/SpamStatus.java
similarity index 96%
rename from java/com/android/dialer/spam/SpamStatus.java
rename to java/com/android/dialer/spam/status/SpamStatus.java
index 0b859d1..8186ac5 100644
--- a/java/com/android/dialer/spam/SpamStatus.java
+++ b/java/com/android/dialer/spam/status/SpamStatus.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.dialer.spam;
+package com.android.dialer.spam.status;
 
 import com.google.common.base.Optional;
 
diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java
index 1b2670e..0e89ac7 100644
--- a/java/com/android/incallui/call/CallList.java
+++ b/java/com/android/incallui/call/CallList.java
@@ -42,7 +42,7 @@
 import com.android.dialer.shortcuts.ShortcutUsageReporter;
 import com.android.dialer.spam.Spam;
 import com.android.dialer.spam.SpamComponent;
-import com.android.dialer.spam.SpamStatus;
+import com.android.dialer.spam.status.SpamStatus;
 import com.android.dialer.telecom.TelecomCallUtil;
 import com.android.incallui.call.state.DialerCallState;
 import com.android.incallui.latencyreport.LatencyReport;