diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java
index ca0a7f961..4584ac5a9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/ClippingDrawCommandManager.java
@@ -12,9 +12,6 @@ package com.facebook.react.flat;
 import javax.annotation.Nullable;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 
 import android.graphics.Canvas;
 import android.graphics.Rect;
@@ -24,7 +21,7 @@ import android.view.View;
 import android.view.animation.Animation;
 
 import com.facebook.infer.annotation.Assertions;
-import com.facebook.react.views.view.ReactClippingViewGroupHelper;
+import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
 
 /**
  * Abstract class for a {@link DrawCommandManager} with directional clipping.  Allows support for
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
index 62c5899fa..07847f14d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java
@@ -14,7 +14,6 @@ import javax.annotation.Nullable;
 import android.graphics.Rect;
 
 import com.facebook.csslayout.CSSNode;
-import com.facebook.csslayout.CSSNodeAPI;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.OnLayoutEvent;
@@ -22,7 +21,7 @@ import com.facebook.react.uimanager.ReactShadowNode;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.views.view.ReactClippingViewGroupHelper;
+import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
 
 /**
  * FlatShadowNode is a base class for all shadow node used in FlatUIImplementation. It extends
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java
index dc5f8f677..9efe84161 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java
@@ -13,7 +13,6 @@ import javax.annotation.Nullable;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
-import java.util.Collection;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -41,7 +40,7 @@ import com.facebook.react.uimanager.ReactCompoundViewGroup;
 import com.facebook.react.uimanager.ReactPointerEventsView;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.views.image.ImageLoadEvent;
-import com.facebook.react.views.view.ReactClippingViewGroup;
+import com.facebook.react.uimanager.ReactClippingViewGroup;
 
 /**
  * A view that the {@link FlatShadowNode} hierarchy maps to.  Can mount and draw native views as
diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java
index b518c5d1e..dd1caade0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTViewManager.java
@@ -24,7 +24,7 @@ import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.PointerEvents;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.views.view.ReactClippingViewGroupHelper;
+import com.facebook.react.uimanager.ReactClippingViewGroupHelper;
 import com.facebook.react.views.view.ReactDrawableHelper;
 
 /**