diff --git a/Android.bp b/Android.bp
index d0e5041..db6b4af 100644
--- a/Android.bp
+++ b/Android.bp
@@ -30,7 +30,7 @@
 }
 
 java_library {
-  name: "obex",
+  name: "com.android.obex",
 
   srcs: ["**/*.java"],
   apex_available: [
diff --git a/javax/obex/ApplicationParameter.java b/src/com/android/obex/ApplicationParameter.java
similarity index 99%
rename from javax/obex/ApplicationParameter.java
rename to src/com/android/obex/ApplicationParameter.java
index c2f14c6..138f9a3 100644
--- a/javax/obex/ApplicationParameter.java
+++ b/src/com/android/obex/ApplicationParameter.java
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 /**
  * Represents an Application Parameter header for OBEX as defined by the IrDA specification.
diff --git a/javax/obex/Authenticator.java b/src/com/android/obex/Authenticator.java
similarity index 99%
rename from javax/obex/Authenticator.java
rename to src/com/android/obex/Authenticator.java
index 12ef47f..0d028e8 100644
--- a/javax/obex/Authenticator.java
+++ b/src/com/android/obex/Authenticator.java
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 /**
  * This interface provides a way to respond to authentication challenge and
diff --git a/javax/obex/BaseStream.java b/src/com/android/obex/BaseStream.java
similarity index 98%
rename from javax/obex/BaseStream.java
rename to src/com/android/obex/BaseStream.java
index 440e060..f656a67 100644
--- a/javax/obex/BaseStream.java
+++ b/src/com/android/obex/BaseStream.java
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 import java.io.IOException;
 
diff --git a/javax/obex/ClientOperation.java b/src/com/android/obex/ClientOperation.java
similarity index 99%
rename from javax/obex/ClientOperation.java
rename to src/com/android/obex/ClientOperation.java
index d5387d1..8aa15c3 100644
--- a/javax/obex/ClientOperation.java
+++ b/src/com/android/obex/ClientOperation.java
@@ -32,7 +32,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
diff --git a/javax/obex/ClientSession.java b/src/com/android/obex/ClientSession.java
similarity index 99%
rename from javax/obex/ClientSession.java
rename to src/com/android/obex/ClientSession.java
index fcdc2c7..c3d876f 100644
--- a/javax/obex/ClientSession.java
+++ b/src/com/android/obex/ClientSession.java
@@ -32,7 +32,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 import android.util.Log;
 
diff --git a/javax/obex/HeaderSet.java b/src/com/android/obex/HeaderSet.java
similarity index 99%
rename from javax/obex/HeaderSet.java
rename to src/com/android/obex/HeaderSet.java
index 8ce8d5f..28c12ae 100644
--- a/javax/obex/HeaderSet.java
+++ b/src/com/android/obex/HeaderSet.java
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -39,7 +39,7 @@
 import java.util.Calendar;
 
 /**
- * This class implements the javax.obex.HeaderSet interface for OBEX over
+ * This class implements the com.android.obex.HeaderSet interface for OBEX over
  * RFCOMM or OBEX over l2cap.
  */
 public final class HeaderSet {
diff --git a/javax/obex/ObexHelper.java b/src/com/android/obex/ObexHelper.java
similarity index 99%
rename from javax/obex/ObexHelper.java
rename to src/com/android/obex/ObexHelper.java
index 30dc8f8..5a21252 100644
--- a/javax/obex/ObexHelper.java
+++ b/src/com/android/obex/ObexHelper.java
@@ -32,7 +32,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 import android.util.Log;
 
diff --git a/javax/obex/ObexPacket.java b/src/com/android/obex/ObexPacket.java
similarity index 98%
rename from javax/obex/ObexPacket.java
rename to src/com/android/obex/ObexPacket.java
index bb6c96e..be8446a 100644
--- a/javax/obex/ObexPacket.java
+++ b/src/com/android/obex/ObexPacket.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.obex;
+package com.android.obex;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/javax/obex/ObexSession.java b/src/com/android/obex/ObexSession.java
similarity index 99%
rename from javax/obex/ObexSession.java
rename to src/com/android/obex/ObexSession.java
index 373e573..a3abc19 100644
--- a/javax/obex/ObexSession.java
+++ b/src/com/android/obex/ObexSession.java
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 import android.util.Log;
 
diff --git a/javax/obex/ObexTransport.java b/src/com/android/obex/ObexTransport.java
similarity index 99%
rename from javax/obex/ObexTransport.java
rename to src/com/android/obex/ObexTransport.java
index cb16c17..f3090dc 100644
--- a/javax/obex/ObexTransport.java
+++ b/src/com/android/obex/ObexTransport.java
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/javax/obex/Operation.java b/src/com/android/obex/Operation.java
similarity index 99%
rename from javax/obex/Operation.java
rename to src/com/android/obex/Operation.java
index 1f6c20a..03ca603 100644
--- a/javax/obex/Operation.java
+++ b/src/com/android/obex/Operation.java
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/javax/obex/PasswordAuthentication.java b/src/com/android/obex/PasswordAuthentication.java
similarity index 98%
rename from javax/obex/PasswordAuthentication.java
rename to src/com/android/obex/PasswordAuthentication.java
index cb2303e..4c464d0 100644
--- a/javax/obex/PasswordAuthentication.java
+++ b/src/com/android/obex/PasswordAuthentication.java
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 /**
  * This class holds user name and password combinations.
diff --git a/javax/obex/PrivateInputStream.java b/src/com/android/obex/PrivateInputStream.java
similarity index 99%
rename from javax/obex/PrivateInputStream.java
rename to src/com/android/obex/PrivateInputStream.java
index 18219f9..b5ea71c 100644
--- a/javax/obex/PrivateInputStream.java
+++ b/src/com/android/obex/PrivateInputStream.java
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/javax/obex/PrivateOutputStream.java b/src/com/android/obex/PrivateOutputStream.java
similarity index 99%
rename from javax/obex/PrivateOutputStream.java
rename to src/com/android/obex/PrivateOutputStream.java
index e8bfd1c..5bda078 100644
--- a/javax/obex/PrivateOutputStream.java
+++ b/src/com/android/obex/PrivateOutputStream.java
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/javax/obex/ResponseCodes.java b/src/com/android/obex/ResponseCodes.java
similarity index 99%
rename from javax/obex/ResponseCodes.java
rename to src/com/android/obex/ResponseCodes.java
index a46490d..796bf29 100644
--- a/javax/obex/ResponseCodes.java
+++ b/src/com/android/obex/ResponseCodes.java
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 /**
  * The <code>ResponseCodes</code> class contains the list of valid response
diff --git a/javax/obex/ServerOperation.java b/src/com/android/obex/ServerOperation.java
similarity index 99%
rename from javax/obex/ServerOperation.java
rename to src/com/android/obex/ServerOperation.java
index 4e77b6c..43b7138 100644
--- a/javax/obex/ServerOperation.java
+++ b/src/com/android/obex/ServerOperation.java
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 import android.util.Log;
 
diff --git a/javax/obex/ServerRequestHandler.java b/src/com/android/obex/ServerRequestHandler.java
similarity index 99%
rename from javax/obex/ServerRequestHandler.java
rename to src/com/android/obex/ServerRequestHandler.java
index f33f234..95cd31f 100644
--- a/javax/obex/ServerRequestHandler.java
+++ b/src/com/android/obex/ServerRequestHandler.java
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 /**
  * The <code>ServerRequestHandler</code> class defines an event listener that
diff --git a/javax/obex/ServerSession.java b/src/com/android/obex/ServerSession.java
similarity index 99%
rename from javax/obex/ServerSession.java
rename to src/com/android/obex/ServerSession.java
index 68cd766..41adcbe 100644
--- a/javax/obex/ServerSession.java
+++ b/src/com/android/obex/ServerSession.java
@@ -32,7 +32,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 import android.util.Log;
 
diff --git a/javax/obex/SessionNotifier.java b/src/com/android/obex/SessionNotifier.java
similarity index 99%
rename from javax/obex/SessionNotifier.java
rename to src/com/android/obex/SessionNotifier.java
index d2760f7..b0f10de 100644
--- a/javax/obex/SessionNotifier.java
+++ b/src/com/android/obex/SessionNotifier.java
@@ -30,7 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package javax.obex;
+package com.android.obex;
 
 import java.io.IOException;