diff --git a/staticlibs/device/android/net/util/Struct.java b/staticlibs/device/com/android/net/module/util/Struct.java
similarity index 99%
rename from staticlibs/device/android/net/util/Struct.java
rename to staticlibs/device/com/android/net/module/util/Struct.java
index 841829e..bc8761a 100644
--- a/staticlibs/device/android/net/util/Struct.java
+++ b/staticlibs/device/com/android/net/module/util/Struct.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.net.util;
+package com.android.net.module.util;
 
 import android.annotation.NonNull;
 
@@ -293,7 +293,7 @@
      *
      * @param bigInteger The number to convert.
      * @param order Indicate ByteBuffer is read as little-endian or big-endian.
-     * @param type The annotation type.
+     * @param type The annotation U64 type.
      *
      * BigInteger#toByteArray returns a byte array containing the 2's complement representation
      * of this BigInteger, in big-endian. If annotation type is U64 and ByteBuffer is read as
diff --git a/staticlibs/tests/unit/src/android/net/util/StructTest.java b/staticlibs/tests/unit/src/com/android/net/module/util/StructTest.java
similarity index 99%
rename from staticlibs/tests/unit/src/android/net/util/StructTest.java
rename to staticlibs/tests/unit/src/com/android/net/module/util/StructTest.java
index 59c94b2..1b03e75 100644
--- a/staticlibs/tests/unit/src/android/net/util/StructTest.java
+++ b/staticlibs/tests/unit/src/com/android/net/module/util/StructTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.net.util;
+package com.android.net.module.util;
 
 import static com.android.testutils.MiscAsserts.assertThrows;
 
@@ -23,13 +23,13 @@
 import static org.junit.Assert.assertTrue;
 
 import android.net.IpPrefix;
-import android.net.util.Struct.Field;
-import android.net.util.Struct.Type;
 
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.internal.util.HexDump;
+import com.android.net.module.util.Struct.Field;
+import com.android.net.module.util.Struct.Type;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;