rename from mobile/android/base/java/org/mozilla/gecko/drawable/DrawableWrapper.java
rename to mobile/android/app/src/photon/java/org/mozilla/gecko/drawable/DrawableWrapper.java

rename from mobile/android/base/java/org/mozilla/gecko/drawable/ShiftDrawable.java
rename to mobile/android/app/src/photon/java/org/mozilla/gecko/drawable/ShiftDrawable.java

rename from mobile/android/base/java/org/mozilla/gecko/widget/AnimatedProgressBar.java
rename to mobile/android/app/src/photon/java/org/mozilla/gecko/widget/AnimatedProgressBar.java

rename from mobile/android/base/resources/drawable/photon_progressbar.xml
rename to mobile/android/app/src/photon/res/drawable/progressbar.xml

copy from mobile/android/base/resources/layout/customtabs_activity.xml
copy to mobile/android/app/src/photon/res/layout/customtabs_activity.xml
--- a/mobile/android/base/resources/layout/customtabs_activity.xml
+++ b/mobile/android/app/src/photon/res/layout/customtabs_activity.xml
@@ -50,19 +50,19 @@
 
     <org.mozilla.gecko.widget.AnimatedProgressBar
         android:id="@id/page_progress"
         style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
         android:layout_width="match_parent"
         android:layout_height="4dp"
         android:layout_alignTop="@id/main_layout"
         android:background="@drawable/url_bar_bg"
-        android:progressDrawable="@drawable/photon_progressbar"
+        android:progressDrawable="@drawable/progressbar"
         app:wrapShiftDrawable="true"
         tools:progress="70"/>
 
     <View android:id="@+id/custom_tabs_doorhanger_overlay"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
           android:background="@color/dark_transparent_overlay"
           android:alpha="0"
           android:layerType="hardware"/>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>

new file mode 100644
--- /dev/null
+++ b/mobile/android/app/src/photon/res/values/attrs.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <declare-styleable name="AnimatedProgressBar">
+        <attr name="wrapShiftDrawable" format="boolean" />
+        <attr name="shiftDuration" format="reference" />
+        <attr name="shiftInterpolator" format="reference" />
+    </declare-styleable>
+
+</resources>
+

--- a/mobile/android/base/resources/layout/customtabs_activity.xml
+++ b/mobile/android/base/resources/layout/customtabs_activity.xml
@@ -43,25 +43,24 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scrollbars="none"/>
 
         </RelativeLayout>
 
     </view>
 
-    <org.mozilla.gecko.widget.AnimatedProgressBar
+    <ProgressBar
         android:id="@id/page_progress"
         style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
         android:layout_width="match_parent"
         android:layout_height="4dp"
         android:layout_alignTop="@id/main_layout"
         android:background="@drawable/url_bar_bg"
-        android:progressDrawable="@drawable/photon_progressbar"
-        app:wrapShiftDrawable="true"
+        android:progressDrawable="@drawable/progressbar"
         tools:progress="70"/>
 
     <View android:id="@+id/custom_tabs_doorhanger_overlay"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
           android:background="@color/dark_transparent_overlay"
           android:alpha="0"
           android:layerType="hardware"/>

--- a/mobile/android/base/resources/values/attrs.xml
+++ b/mobile/android/base/resources/values/attrs.xml
@@ -169,16 +169,10 @@
              otherwise only available on API 21+.
 
              Using this attribute is mutually exclusive with android:tint
              and setting colorFilters in code. This is because on pre-Lollipop,
              android:tint and DrawableCompat.tint* uses colorFilters under the hood. -->
         <attr name="drawableTintList" format="color" />
     </declare-styleable>
 
-    <declare-styleable name="AnimatedProgressBar">
-        <attr name="wrapShiftDrawable" format="boolean" />
-        <attr name="shiftDuration" format="reference" />
-        <attr name="shiftInterpolator" format="reference" />
-    </declare-styleable>
-
 </resources>