diff --git a/mobile/android/base/AnimatedHeightLayout.java b/mobile/android/base/AnimatedHeightLayout.java
index e95d870e3418..40817371b43d 100644
--- a/mobile/android/base/AnimatedHeightLayout.java
+++ b/mobile/android/base/AnimatedHeightLayout.java
@@ -4,6 +4,8 @@
 
 package org.mozilla.gecko;
 
+import org.mozilla.gecko.animation.HeightChangeAnimation;
+
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.animation.Animation;
diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 7634ce8011c3..e85a55bd2a97 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -5,6 +5,7 @@
 
 package org.mozilla.gecko;
 
+import org.mozilla.gecko.animation.PropertyAnimator;
 import org.mozilla.gecko.db.BrowserContract.Combined;
 import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.gfx.BitmapUtils;
diff --git a/mobile/android/base/BrowserToolbar.java b/mobile/android/base/BrowserToolbar.java
index faa348a98cd8..fc8083409fbf 100644
--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -5,6 +5,8 @@
 
 package org.mozilla.gecko;
 
+import org.mozilla.gecko.animation.PropertyAnimator;
+import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.gfx.ImmutableViewportMetrics;
 import org.mozilla.gecko.gfx.LayerView;
 import org.mozilla.gecko.util.StringUtils;
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 71af8c936943..838ce911787f 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -50,12 +50,16 @@ FENNEC_JAVA_FILES = \
   AllCapsTextView.java \
   AndroidImport.java \
   AndroidImportPreference.java \
-  AnimatorProxy.java \
   AnimatedHeightLayout.java \
   AppNotificationClient.java \
   AwesomeBar.java \
   AwesomebarResultHandler.java \
   AwesomeBarTabs.java \
+  animation/AnimatorProxy.java \
+  animation/HeightChangeAnimation.java \
+  animation/PropertyAnimator.java \
+  animation/Rotate3DAnimation.java \
+  animation/ViewHelper.java \
   awesomebar/AwesomeBarTab.java \
   awesomebar/AllPagesTab.java \
   awesomebar/BookmarksTab.java \
@@ -111,7 +115,6 @@ FENNEC_JAVA_FILES = \
   GeckoJavaSampler.java \
   GlobalHistory.java \
   GeckoViewsFactory.java \
-  HeightChangeAnimation.java \
   InputMethods.java \
   JavaAddonManager.java \
   LightweightTheme.java \
@@ -132,7 +135,6 @@ FENNEC_JAVA_FILES = \
   PrefsHelper.java \
   PrivateDataPreference.java \
   PrivateTab.java \
-  PropertyAnimator.java \
   ProfileMigrator.java \
   PromptService.java \
   Restarter.java \
@@ -143,7 +145,6 @@ FENNEC_JAVA_FILES = \
   ReaderModeUtils.java \
   RemoteTabs.java \
   RobocopAPI.java \
-  Rotate3DAnimation.java \
   ServiceNotificationClient.java \
   SessionParser.java \
   SetupScreen.java \
@@ -166,7 +167,6 @@ FENNEC_JAVA_FILES = \
   TouchEventInterceptor.java \
   UpdateServiceHelper.java \
   VideoPlayer.java \
-  ViewHelper.java \
   WebAppAllocator.java \
   WebAppImpl.java \
   ZoomConstraints.java \
diff --git a/mobile/android/base/TabCounter.java b/mobile/android/base/TabCounter.java
index 8fb8d65ab601..3dab6e5751c8 100644
--- a/mobile/android/base/TabCounter.java
+++ b/mobile/android/base/TabCounter.java
@@ -5,6 +5,8 @@
 
 package org.mozilla.gecko;
 
+import org.mozilla.gecko.animation.Rotate3DAnimation;
+
 import android.content.Context;
 import android.os.Build;
 import android.view.accessibility.AccessibilityNodeInfo;
diff --git a/mobile/android/base/TabsPanel.java b/mobile/android/base/TabsPanel.java
index c9ae5542158c..6b8feca6193d 100644
--- a/mobile/android/base/TabsPanel.java
+++ b/mobile/android/base/TabsPanel.java
@@ -5,6 +5,8 @@
 
 package org.mozilla.gecko;
 
+import org.mozilla.gecko.animation.PropertyAnimator;
+import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.widget.IconTabWidget;
 
 import android.content.Context;
diff --git a/mobile/android/base/TabsTray.java b/mobile/android/base/TabsTray.java
index 4679d809e14d..14a3a2d876fb 100644
--- a/mobile/android/base/TabsTray.java
+++ b/mobile/android/base/TabsTray.java
@@ -5,7 +5,9 @@
 
 package org.mozilla.gecko;
 
-import org.mozilla.gecko.PropertyAnimator.Property;
+import org.mozilla.gecko.animation.PropertyAnimator;
+import org.mozilla.gecko.animation.PropertyAnimator.Property;
+import org.mozilla.gecko.animation.ViewHelper;
 import org.mozilla.gecko.widget.TwoWayView;
 
 import android.content.Context;
diff --git a/mobile/android/base/AnimatorProxy.java b/mobile/android/base/animation/AnimatorProxy.java
similarity index 99%
rename from mobile/android/base/AnimatorProxy.java
rename to mobile/android/base/animation/AnimatorProxy.java
index 08479417f387..357036af49ce 100644
--- a/mobile/android/base/AnimatorProxy.java
+++ b/mobile/android/base/animation/AnimatorProxy.java
@@ -3,7 +3,7 @@
  * 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/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.animation;
 
 import android.graphics.Matrix;
 import android.graphics.RectF;
@@ -17,7 +17,7 @@ import android.view.animation.Transformation;
 import java.lang.ref.WeakReference;
 import java.util.WeakHashMap;
 
-public class AnimatorProxy {
+class AnimatorProxy {
     private static final WeakHashMap<View, AnimatorProxy> PROXIES =
             new WeakHashMap<View, AnimatorProxy>();
 
diff --git a/mobile/android/base/HeightChangeAnimation.java b/mobile/android/base/animation/HeightChangeAnimation.java
similarity index 95%
rename from mobile/android/base/HeightChangeAnimation.java
rename to mobile/android/base/animation/HeightChangeAnimation.java
index faeacfa786e6..bf8007bbfab3 100644
--- a/mobile/android/base/HeightChangeAnimation.java
+++ b/mobile/android/base/animation/HeightChangeAnimation.java
@@ -2,7 +2,7 @@
  * 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/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.animation;
 
 import android.view.View;
 import android.view.animation.Animation;
diff --git a/mobile/android/base/PropertyAnimator.java b/mobile/android/base/animation/PropertyAnimator.java
similarity index 99%
rename from mobile/android/base/PropertyAnimator.java
rename to mobile/android/base/animation/PropertyAnimator.java
index 3ec28ba9d8ce..f168845c0f56 100644
--- a/mobile/android/base/PropertyAnimator.java
+++ b/mobile/android/base/animation/PropertyAnimator.java
@@ -3,7 +3,7 @@
  * 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/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.animation;
 
 import android.support.v4.view.ViewCompat;
 import android.os.Build;
diff --git a/mobile/android/base/Rotate3DAnimation.java b/mobile/android/base/animation/Rotate3DAnimation.java
similarity index 98%
rename from mobile/android/base/Rotate3DAnimation.java
rename to mobile/android/base/animation/Rotate3DAnimation.java
index 089c66f011a1..7366e7d6230d 100644
--- a/mobile/android/base/Rotate3DAnimation.java
+++ b/mobile/android/base/animation/Rotate3DAnimation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.animation;
 
 import android.view.animation.Animation;
 import android.view.animation.Transformation;
diff --git a/mobile/android/base/ViewHelper.java b/mobile/android/base/animation/ViewHelper.java
similarity index 97%
rename from mobile/android/base/ViewHelper.java
rename to mobile/android/base/animation/ViewHelper.java
index 752239e72613..65fe9eff4e16 100644
--- a/mobile/android/base/ViewHelper.java
+++ b/mobile/android/base/animation/ViewHelper.java
@@ -2,7 +2,7 @@
  * 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/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.animation;
 
 import android.view.View;