diff --git a/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/LayoutPropExtractor.kt b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/LayoutPropExtractor.kt
index 22a9f1f6c..c50549c18 100644
--- a/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/LayoutPropExtractor.kt
+++ b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/uidebugger/litho/descriptors/props/LayoutPropExtractor.kt
@@ -9,9 +9,9 @@ package com.facebook.flipper.plugins.uidebugger.litho.descriptors.props
 
 import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
-import com.facebook.flipper.plugins.uidebugger.common.enumToInspectableSet
 import com.facebook.flipper.plugins.uidebugger.descriptors.MetadataRegister
 import com.facebook.flipper.plugins.uidebugger.model.*
+import com.facebook.flipper.plugins.uidebugger.util.enumToInspectableSet
 import com.facebook.litho.DebugComponent
 import com.facebook.yoga.*
 
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/common/BitmapPool.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/BitmapPool.kt
similarity index 97%
rename from android/src/main/java/com/facebook/flipper/plugins/uidebugger/common/BitmapPool.kt
rename to android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/BitmapPool.kt
index 5a779c1a9..7d2dd19b8 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/common/BitmapPool.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/BitmapPool.kt
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.flipper.plugins.uidebugger.common
+package com.facebook.flipper.plugins.uidebugger.core
 
 import android.graphics.Bitmap
 import kotlinx.coroutines.CoroutineScope
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/Snapshot.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/Snapshot.kt
index 814c68793..3e003bc41 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/Snapshot.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/Snapshot.kt
@@ -17,7 +17,6 @@ import android.view.PixelCopy
 import android.view.View
 import androidx.annotation.RequiresApi
 import com.facebook.flipper.plugins.uidebugger.LogTag
-import com.facebook.flipper.plugins.uidebugger.common.BitmapPool
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/UIDContext.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/UIDContext.kt
index 32737c736..9d2fd9761 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/UIDContext.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/UIDContext.kt
@@ -12,7 +12,6 @@ import android.os.Build
 import android.util.Log
 import com.facebook.flipper.core.FlipperConnection
 import com.facebook.flipper.plugins.uidebugger.LogTag
-import com.facebook.flipper.plugins.uidebugger.common.BitmapPool
 import com.facebook.flipper.plugins.uidebugger.descriptors.DescriptorRegister
 import com.facebook.flipper.plugins.uidebugger.model.FrameworkEvent
 import com.facebook.flipper.plugins.uidebugger.model.FrameworkEventMetadata
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/UpdateQueue.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/UpdateQueue.kt
index 218ff2cd2..fd785728c 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/UpdateQueue.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/core/UpdateQueue.kt
@@ -13,7 +13,6 @@ import android.util.Base64
 import android.util.Base64OutputStream
 import android.util.Log
 import com.facebook.flipper.plugins.uidebugger.LogTag
-import com.facebook.flipper.plugins.uidebugger.common.BitmapPool
 import com.facebook.flipper.plugins.uidebugger.descriptors.Id
 import com.facebook.flipper.plugins.uidebugger.descriptors.MetadataRegister
 import com.facebook.flipper.plugins.uidebugger.model.FrameScanEvent
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/DescriptorRegister.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/DescriptorRegister.kt
index 8bdc78965..f3088bd26 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/DescriptorRegister.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/DescriptorRegister.kt
@@ -16,8 +16,8 @@ import android.view.Window
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.viewpager.widget.ViewPager
-import com.facebook.flipper.plugins.uidebugger.common.UIDebuggerException
 import com.facebook.flipper.plugins.uidebugger.core.ApplicationRef
+import com.facebook.flipper.plugins.uidebugger.util.UIDebuggerException
 
 class DescriptorRegister {
   private val register: MutableMap<Class<*>, NodeDescriptor<*>> = HashMap()
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ImageViewDescriptor.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ImageViewDescriptor.kt
index a6b37146e..a85be2441 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ImageViewDescriptor.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ImageViewDescriptor.kt
@@ -9,12 +9,12 @@ package com.facebook.flipper.plugins.uidebugger.descriptors
 
 import android.widget.ImageView
 import android.widget.ImageView.ScaleType
-import com.facebook.flipper.plugins.uidebugger.common.EnumMapping
-import com.facebook.flipper.plugins.uidebugger.common.enumMapping
-import com.facebook.flipper.plugins.uidebugger.common.enumToInspectableSet
 import com.facebook.flipper.plugins.uidebugger.model.Inspectable
 import com.facebook.flipper.plugins.uidebugger.model.InspectableObject
 import com.facebook.flipper.plugins.uidebugger.model.MetadataId
+import com.facebook.flipper.plugins.uidebugger.util.EnumMapping
+import com.facebook.flipper.plugins.uidebugger.util.enumMapping
+import com.facebook.flipper.plugins.uidebugger.util.enumToInspectableSet
 
 object ImageViewDescriptor : ChainedDescriptor<ImageView>() {
 
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ViewDescriptor.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ViewDescriptor.kt
index 5003bb3f2..3b0b40425 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ViewDescriptor.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ViewDescriptor.kt
@@ -19,8 +19,8 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.widget.LinearLayout
 import androidx.viewpager.widget.ViewPager
-import com.facebook.flipper.plugins.uidebugger.common.*
 import com.facebook.flipper.plugins.uidebugger.model.*
+import com.facebook.flipper.plugins.uidebugger.util.EnumMapping
 import com.facebook.flipper.plugins.uidebugger.util.ResourcesUtil
 import java.lang.reflect.Field
 import kotlinx.serialization.json.JsonElement
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ViewGroupDescriptor.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ViewGroupDescriptor.kt
index bce9d9ce2..140116e4b 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ViewGroupDescriptor.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/ViewGroupDescriptor.kt
@@ -11,9 +11,9 @@ import android.os.Build
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.ViewGroupCompat
-import com.facebook.flipper.plugins.uidebugger.common.EnumMapping
 import com.facebook.flipper.plugins.uidebugger.core.FragmentTracker
 import com.facebook.flipper.plugins.uidebugger.model.*
+import com.facebook.flipper.plugins.uidebugger.util.EnumMapping
 
 object ViewGroupDescriptor : ChainedDescriptor<ViewGroup>() {
 
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/common/EnumMapping.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/util/EnumMapping.kt
similarity index 97%
rename from android/src/main/java/com/facebook/flipper/plugins/uidebugger/common/EnumMapping.kt
rename to android/src/main/java/com/facebook/flipper/plugins/uidebugger/util/EnumMapping.kt
index 5468dc901..bd0f41edc 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/common/EnumMapping.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/util/EnumMapping.kt
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.flipper.plugins.uidebugger.common
+package com.facebook.flipper.plugins.uidebugger.util
 
 import android.util.Log
 import com.facebook.flipper.plugins.uidebugger.LogTag
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/common/Exceptions.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/util/Exceptions.kt
similarity index 82%
rename from android/src/main/java/com/facebook/flipper/plugins/uidebugger/common/Exceptions.kt
rename to android/src/main/java/com/facebook/flipper/plugins/uidebugger/util/Exceptions.kt
index f5efa9f16..49c55aad9 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/common/Exceptions.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/util/Exceptions.kt
@@ -5,6 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.flipper.plugins.uidebugger.common
+package com.facebook.flipper.plugins.uidebugger.util
 
 class UIDebuggerException(message: String) : Exception(message)
diff --git a/android/src/test/java/com/facebook/flipper/plugins/uidebugger/EnumMappingTest.kt b/android/src/test/java/com/facebook/flipper/plugins/uidebugger/EnumMappingTest.kt
index 226c6c671..4111040f2 100644
--- a/android/src/test/java/com/facebook/flipper/plugins/uidebugger/EnumMappingTest.kt
+++ b/android/src/test/java/com/facebook/flipper/plugins/uidebugger/EnumMappingTest.kt
@@ -8,8 +8,8 @@
 package com.facebook.flipper.plugins.uidebugger
 
 import android.view.View
-import com.facebook.flipper.plugins.uidebugger.common.EnumMapping
 import com.facebook.flipper.plugins.uidebugger.model.InspectableValue
+import com.facebook.flipper.plugins.uidebugger.util.EnumMapping
 import org.hamcrest.CoreMatchers.*
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test