diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 3f35900..5a911d0 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -595,7 +595,7 @@
                                       CallFeaturesSetting.HAC_VAL_ON :
                                       CallFeaturesSetting.HAC_VAL_OFF);
         }
-   }
+    }
 
     /**
      * Returns the singleton instance of the PhoneApp.
diff --git a/src/com/android/phone/v2/Call.java b/src/com/android/phone/v2/Call.java
index 460b33c..0e72f10 100644
--- a/src/com/android/phone/v2/Call.java
+++ b/src/com/android/phone/v2/Call.java
@@ -1,4 +1,4 @@
-package com.android.phone;
+package com.android.phone.v2;
 
 public class Call {
 
diff --git a/src/com/android/phone/v2/CallService.java b/src/com/android/phone/v2/CallService.java
index fb9d989..7b58dfb 100644
--- a/src/com/android/phone/v2/CallService.java
+++ b/src/com/android/phone/v2/CallService.java
@@ -1,7 +1,7 @@
-package com.android.phone;
+package com.android.phone.v2;
 
-import com.android.phone.control.CallServiceAdapter;
-import com.android.phone.exceptions.OutgoingCallException;
+import com.android.phone.v2.control.CallServiceAdapter;
+import com.android.phone.v2.exceptions.OutgoingCallException;
 
 public interface CallService {
 
diff --git a/src/com/android/phone/v2/CallServiceType.java b/src/com/android/phone/v2/CallServiceType.java
index b0fe4f0..4ba4bc1 100644
--- a/src/com/android/phone/v2/CallServiceType.java
+++ b/src/com/android/phone/v2/CallServiceType.java
@@ -1,4 +1,4 @@
-package com.android.phone;
+package com.android.phone.v2;
 
 public enum CallServiceType {
   GSM,
diff --git a/src/com/android/phone/v2/ContactInfo.java b/src/com/android/phone/v2/ContactInfo.java
index 7ccbb2f..89955ad 100644
--- a/src/com/android/phone/v2/ContactInfo.java
+++ b/src/com/android/phone/v2/ContactInfo.java
@@ -1,4 +1,4 @@
-package com.android.phone;
+package com.android.phone.v2;
 
 public class ContactInfo {
 }
diff --git a/src/com/android/phone/v2/control/CallLogManager.java b/src/com/android/phone/v2/control/CallLogManager.java
index e45e014..60f8e58 100644
--- a/src/com/android/phone/v2/control/CallLogManager.java
+++ b/src/com/android/phone/v2/control/CallLogManager.java
@@ -1,4 +1,4 @@
-package com.android.phone.control;
+package com.android.phone.v2.control;
 
 /** Package private */
 class CallLogManager {
diff --git a/src/com/android/phone/v2/control/CallRejectionPolicy.java b/src/com/android/phone/v2/control/CallRejectionPolicy.java
index 031bd87..8b4e928 100644
--- a/src/com/android/phone/v2/control/CallRejectionPolicy.java
+++ b/src/com/android/phone/v2/control/CallRejectionPolicy.java
@@ -1,4 +1,4 @@
-package com.android.phone.control;
+package com.android.phone.v2.control;
 
 // Can be used to reject incoming calls, see CallRestrictionPolicy regarding
 // outgoing calls.
diff --git a/src/com/android/phone/v2/control/CallRestrictionPolicy.java b/src/com/android/phone/v2/control/CallRestrictionPolicy.java
index d91399e..b74b0a4 100644
--- a/src/com/android/phone/v2/control/CallRestrictionPolicy.java
+++ b/src/com/android/phone/v2/control/CallRestrictionPolicy.java
@@ -1,7 +1,7 @@
-package com.android.phone.control;
+package com.android.phone.v2.control;
 
-import com.android.phone.ContactInfo;
-import com.android.phone.exceptions.RestrictedCallException;
+import com.android.phone.v2.ContactInfo;
+import com.android.phone.v2.exceptions.RestrictedCallException;
 
 // Can be used to prevent outgoing calls based on arbitrary restrictions across
 // call services (e.g. black listing a phone number regardless if it is
diff --git a/src/com/android/phone/v2/control/CallServiceAdapter.java b/src/com/android/phone/v2/control/CallServiceAdapter.java
index ab4b85e..ffff6c2 100644
--- a/src/com/android/phone/v2/control/CallServiceAdapter.java
+++ b/src/com/android/phone/v2/control/CallServiceAdapter.java
@@ -1,6 +1,6 @@
-package com.android.phone.control;
+package com.android.phone.v2.control;
 
-import com.android.phone.CallService;
+import com.android.phone.v2.CallService;
 
 /**
  * Only exposes the CallsManager APIs that CallService implementations should
diff --git a/src/com/android/phone/v2/control/CallServiceRegistry.java b/src/com/android/phone/v2/control/CallServiceRegistry.java
index 80ed434..5f8dcd4 100644
--- a/src/com/android/phone/v2/control/CallServiceRegistry.java
+++ b/src/com/android/phone/v2/control/CallServiceRegistry.java
@@ -1,6 +1,6 @@
-package com.android.phone.control;
+package com.android.phone.v2.control;
 
-import com.android.phone.CallService;
+import com.android.phone.v2.CallService;
 
 /** Singleton */
 public class CallServiceRegistry {
diff --git a/src/com/android/phone/v2/control/CallsManager.java b/src/com/android/phone/v2/control/CallsManager.java
index 2bff4e3..2543530 100644
--- a/src/com/android/phone/v2/control/CallsManager.java
+++ b/src/com/android/phone/v2/control/CallsManager.java
@@ -1,9 +1,9 @@
-package com.android.phone.control;
+package com.android.phone.v2.control;
 
-import com.android.phone.CallService;
-import com.android.phone.ContactInfo;
-import com.android.phone.exceptions.CallServiceUnavailableException;
-import com.android.phone.exceptions.RestrictedCallException;
+import com.android.phone.v2.CallService;
+import com.android.phone.v2.ContactInfo;
+import com.android.phone.v2.exceptions.CallServiceUnavailableException;
+import com.android.phone.v2.exceptions.RestrictedCallException;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/phone/v2/control/DialerAdapter.java b/src/com/android/phone/v2/control/DialerAdapter.java
index e9a054d..805df83 100644
--- a/src/com/android/phone/v2/control/DialerAdapter.java
+++ b/src/com/android/phone/v2/control/DialerAdapter.java
@@ -1,9 +1,9 @@
-package com.android.phone.control;
+package com.android.phone.v2.control;
 
-import com.android.phone.ContactInfo;
-import com.android.phone.exceptions.CallServiceUnavailableException;
-import com.android.phone.exceptions.RestrictedCallException;
-import com.android.phone.ui.dialer.DialerController;
+import com.android.phone.v2.ContactInfo;
+import com.android.phone.v2.exceptions.CallServiceUnavailableException;
+import com.android.phone.v2.exceptions.RestrictedCallException;
+import com.android.phone.v2.ui.dialer.DialerController;
 
 /** Only exposes the CallsManager APIs that the Dialer should have access to. */
 // TODO: This class may not be necessary since we do not interact with Dialer directly.
diff --git a/src/com/android/phone/v2/control/InCallAdapter.java b/src/com/android/phone/v2/control/InCallAdapter.java
index 0fc80bd..dd7a259 100644
--- a/src/com/android/phone/v2/control/InCallAdapter.java
+++ b/src/com/android/phone/v2/control/InCallAdapter.java
@@ -1,6 +1,6 @@
-package com.android.phone.control;
+package com.android.phone.v2.control;
 
-import com.android.phone.ui.incall.InCallController;
+import com.android.phone.v2.ui.incall.InCallController;
 
 /** Only exposes the CallsManager APIs that In-Call should have access to. */
 public class InCallAdapter {
diff --git a/src/com/android/phone/v2/control/Switchboard.java b/src/com/android/phone/v2/control/Switchboard.java
index e2217c2..c91ce73 100644
--- a/src/com/android/phone/v2/control/Switchboard.java
+++ b/src/com/android/phone/v2/control/Switchboard.java
@@ -1,9 +1,9 @@
-package com.android.phone.control;
+package com.android.phone.v2.control;
 
-import com.android.phone.CallService;
-import com.android.phone.ContactInfo;
-import com.android.phone.exceptions.CallServiceUnavailableException;
-import com.android.phone.exceptions.OutgoingCallException;
+import com.android.phone.v2.CallService;
+import com.android.phone.v2.ContactInfo;
+import com.android.phone.v2.exceptions.CallServiceUnavailableException;
+import com.android.phone.v2.exceptions.OutgoingCallException;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/phone/v2/control/SwitchboardOptimizer.java b/src/com/android/phone/v2/control/SwitchboardOptimizer.java
index ff0ecaf..3ed9eb3 100644
--- a/src/com/android/phone/v2/control/SwitchboardOptimizer.java
+++ b/src/com/android/phone/v2/control/SwitchboardOptimizer.java
@@ -1,6 +1,6 @@
-package com.android.phone.control;
+package com.android.phone.v2.control;
 
-import com.android.phone.CallService;
+import com.android.phone.v2.CallService;
 
 import java.util.List;
 
diff --git a/src/com/android/phone/v2/control/VoicemailManager.java b/src/com/android/phone/v2/control/VoicemailManager.java
index 1271873..d9d873c 100644
--- a/src/com/android/phone/v2/control/VoicemailManager.java
+++ b/src/com/android/phone/v2/control/VoicemailManager.java
@@ -1,4 +1,4 @@
-package com.android.phone.control;
+package com.android.phone.v2.control;
 
 /** Package private */
 class VoicemailManager {
diff --git a/src/com/android/phone/v2/exceptions/CallServiceUnavailableException.java b/src/com/android/phone/v2/exceptions/CallServiceUnavailableException.java
index 6d21b79..9fcf86e 100644
--- a/src/com/android/phone/v2/exceptions/CallServiceUnavailableException.java
+++ b/src/com/android/phone/v2/exceptions/CallServiceUnavailableException.java
@@ -1,4 +1,4 @@
-package com.android.phone.exceptions;
+package com.android.phone.v2.exceptions;
 
 public class CallServiceUnavailableException extends Exception {
   public CallServiceUnavailableException() {
diff --git a/src/com/android/phone/v2/exceptions/NoCompatibleCallServiceException.java b/src/com/android/phone/v2/exceptions/NoCompatibleCallServiceException.java
index 42124bc..5fe867a 100644
--- a/src/com/android/phone/v2/exceptions/NoCompatibleCallServiceException.java
+++ b/src/com/android/phone/v2/exceptions/NoCompatibleCallServiceException.java
@@ -1,4 +1,4 @@
-package com.android.phone.exceptions;
+package com.android.phone.v2.exceptions;
 
 public class NoCompatibleCallServiceException extends Exception {
   public NoCompatibleCallServiceException() {
diff --git a/src/com/android/phone/v2/exceptions/OutgoingCallException.java b/src/com/android/phone/v2/exceptions/OutgoingCallException.java
index cecd2cb..8f29614 100644
--- a/src/com/android/phone/v2/exceptions/OutgoingCallException.java
+++ b/src/com/android/phone/v2/exceptions/OutgoingCallException.java
@@ -1,4 +1,4 @@
-package com.android.phone.exceptions;
+package com.android.phone.v2.exceptions;
 
 public class OutgoingCallException extends Exception {
   public OutgoingCallException() {
diff --git a/src/com/android/phone/v2/exceptions/RestrictedCallException.java b/src/com/android/phone/v2/exceptions/RestrictedCallException.java
index bf4decf..3e1c9c6 100644
--- a/src/com/android/phone/v2/exceptions/RestrictedCallException.java
+++ b/src/com/android/phone/v2/exceptions/RestrictedCallException.java
@@ -1,4 +1,4 @@
-package com.android.phone.exceptions;
+package com.android.phone.v2.exceptions;
 
 public class RestrictedCallException extends Exception {
   public RestrictedCallException() {
diff --git a/src/com/android/phone/v2/ui/dialer/DialerController.java b/src/com/android/phone/v2/ui/dialer/DialerController.java
index b7753da..fdfda78 100644
--- a/src/com/android/phone/v2/ui/dialer/DialerController.java
+++ b/src/com/android/phone/v2/ui/dialer/DialerController.java
@@ -1,9 +1,9 @@
-package com.android.phone.ui.dialer;
+package com.android.phone.v2.ui.dialer;
 
-import com.android.phone.ContactInfo;
-import com.android.phone.control.DialerAdapter;
-import com.android.phone.exceptions.CallServiceUnavailableException;
-import com.android.phone.exceptions.RestrictedCallException;
+import com.android.phone.v2.ContactInfo;
+import com.android.phone.v2.control.DialerAdapter;
+import com.android.phone.v2.exceptions.CallServiceUnavailableException;
+import com.android.phone.v2.exceptions.RestrictedCallException;
 
 public class DialerController {
 
diff --git a/src/com/android/phone/v2/ui/dialer/DialerUi.java b/src/com/android/phone/v2/ui/dialer/DialerUi.java
index a600945..9bbfb2b 100644
--- a/src/com/android/phone/v2/ui/dialer/DialerUi.java
+++ b/src/com/android/phone/v2/ui/dialer/DialerUi.java
@@ -1,6 +1,6 @@
-package com.android.phone.ui.dialer;
+package com.android.phone.v2.ui.dialer;
 
-import com.android.phone.ContactInfo;
+import com.android.phone.v2.ContactInfo;
 
 /** Package-private? */
 
diff --git a/src/com/android/phone/v2/ui/incall/InCallController.java b/src/com/android/phone/v2/ui/incall/InCallController.java
index 84750d6..5a3b4cf 100644
--- a/src/com/android/phone/v2/ui/incall/InCallController.java
+++ b/src/com/android/phone/v2/ui/incall/InCallController.java
@@ -1,6 +1,6 @@
-package com.android.phone.ui.incall;
+package com.android.phone.v2.ui.incall;
 
-import com.android.phone.control.InCallAdapter;
+import com.android.phone.v2.control.InCallAdapter;
 
 public class InCallController {
 
diff --git a/src/com/android/phone/v2/ui/incall/InCallUi.java b/src/com/android/phone/v2/ui/incall/InCallUi.java
index dde9ab9..effa69d 100644
--- a/src/com/android/phone/v2/ui/incall/InCallUi.java
+++ b/src/com/android/phone/v2/ui/incall/InCallUi.java
@@ -1,4 +1,4 @@
-package com.android.phone.ui.incall;
+package com.android.phone.v2.ui.incall;
 
 /** Package-private? */