diff --git a/mobile/android/base/home/SearchEngineRow.java b/mobile/android/base/home/SearchEngineRow.java
index a317b73b2162..77458798ee5e 100644
--- a/mobile/android/base/home/SearchEngineRow.java
+++ b/mobile/android/base/home/SearchEngineRow.java
@@ -5,14 +5,14 @@
 
 package org.mozilla.gecko.home;
 
-import org.mozilla.gecko.AnimatedHeightLayout;
-import org.mozilla.gecko.FlowLayout;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.home.BrowserSearch.OnEditSuggestionListener;
 import org.mozilla.gecko.home.BrowserSearch.OnSearchListener;
 import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
 import org.mozilla.gecko.util.StringUtils;
+import org.mozilla.gecko.widget.AnimatedHeightLayout;
 import org.mozilla.gecko.widget.FaviconView;
+import org.mozilla.gecko.widget.FlowLayout;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 0bbdb896c3d0..ce5e51211051 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -84,10 +84,8 @@ gbjar.sources += [
     'ActivityHandlerHelper.java',
     'AlertNotification.java',
     'AlignRightLinkPreference.java',
-    'AllCapsTextView.java',
     'AndroidImport.java',
     'AndroidImportPreference.java',
-    'AnimatedHeightLayout.java',
     'AppNotificationClient.java',
     'AutocompleteHandler.java',
     'animation/AnimatorProxy.java',
@@ -102,8 +100,6 @@ gbjar.sources += [
     'CameraImageResultHandler.java',
     'CameraVideoResultHandler.java',
     'CanvasDelegate.java',
-    'CheckableLinearLayout.java',
-    'ClickableWhenDisabledEditText.java',
     'ContactService.java',
     'ContextGetter.java',
     'CustomEditText.java',
@@ -124,7 +120,6 @@ gbjar.sources += [
     'FilePickerResultHandler.java',
     'FilePickerResultHandlerSync.java',
     'FindInPageBar.java',
-    'FlowLayout.java',
     'FontSizePreference.java',
     'FormAssistPopup.java',
     'ForwardButton.java',
@@ -297,11 +292,16 @@ gbjar.sources += [
     'updater/UpdateServiceHelper.java',
     'updater/UpdateService.java',
     'widget/ActivityChooserModel.java',
+    'widget/AllCapsTextView.java',
+    'widget/AnimatedHeightLayout.java',
     'widget/ButtonToast.java',
+    'widget/CheckableLinearLayout.java',
+    'widget/ClickableWhenDisabledEditText.java',
     'widget/ArrowPopup.java',
     'widget/DateTimePicker.java',
     'widget/Divider.java',
     'widget/FaviconView.java',
+    'widget/FlowLayout.java',
     'widget/GeckoPopupMenu.java',
     'widget/GeckoActionProvider.java',
     'widget/IconTabWidget.java',
diff --git a/mobile/android/base/prompts/PromptInput.java b/mobile/android/base/prompts/PromptInput.java
index 75e8ac5a0a87..6a026f5aa1b9 100644
--- a/mobile/android/base/prompts/PromptInput.java
+++ b/mobile/android/base/prompts/PromptInput.java
@@ -5,9 +5,9 @@
 
 package org.mozilla.gecko.prompts;
 
-import org.mozilla.gecko.AllCapsTextView;
 import org.mozilla.gecko.util.GeckoEventResponder;
 import org.mozilla.gecko.util.ThreadUtils;
+import org.mozilla.gecko.widget.AllCapsTextView;
 import org.mozilla.gecko.widget.DateTimePicker;
 
 import org.json.JSONArray;
diff --git a/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_group.xml b/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_group.xml
index 6c1f5ba06dbf..887bd903c2a7 100644
--- a/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_group.xml
+++ b/mobile/android/base/resources/layout-xlarge-v11/remote_tabs_group.xml
@@ -3,16 +3,16 @@
    - 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/. -->
 
-<org.mozilla.gecko.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
-                                   android:id="@+id/client"
-                                   android:layout_width="fill_parent"
-                                   android:layout_height="@dimen/remote_tab_group_row_height"
-                                   style="@style/TabRowTextAppearance.Url"
-                                   android:background="@android:color/transparent"
-                                   android:paddingLeft="2dip"
-                                   android:paddingRight="2dip"
-                                   android:textStyle="bold"
-                                   android:textSize="12sp"
-                                   android:singleLine="false"
-                                   android:maxLines="2"
-                                   android:gravity="center_vertical"/>
+<org.mozilla.gecko.widget.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
+                                          android:id="@+id/client"
+                                          android:layout_width="fill_parent"
+                                          android:layout_height="@dimen/remote_tab_group_row_height"
+                                          style="@style/TabRowTextAppearance.Url"
+                                          android:background="@android:color/transparent"
+                                          android:paddingLeft="2dip"
+                                          android:paddingRight="2dip"
+                                          android:textStyle="bold"
+                                          android:textSize="12sp"
+                                          android:singleLine="false"
+                                          android:maxLines="2"
+                                          android:gravity="center_vertical"/>
diff --git a/mobile/android/base/resources/layout/crash_reporter.xml b/mobile/android/base/resources/layout/crash_reporter.xml
index 1b4aa65e9ab1..d9bfa4c8bd51 100644
--- a/mobile/android/base/resources/layout/crash_reporter.xml
+++ b/mobile/android/base/resources/layout/crash_reporter.xml
@@ -71,7 +71,7 @@
                       android:layout_marginBottom="10dp"
                       android:text="@string/crash_allow_contact2"/>
 
-            <org.mozilla.gecko.ClickableWhenDisabledEditText
+            <org.mozilla.gecko.widget.ClickableWhenDisabledEditText
                     android:id="@+id/email"
                     style="@style/CrashReporter.EditText"
                     android:layout_width="fill_parent"
diff --git a/mobile/android/base/resources/layout/remote_tabs_group.xml b/mobile/android/base/resources/layout/remote_tabs_group.xml
index 43c49a586db3..7f776651458f 100644
--- a/mobile/android/base/resources/layout/remote_tabs_group.xml
+++ b/mobile/android/base/resources/layout/remote_tabs_group.xml
@@ -3,14 +3,14 @@
    - 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/. -->
 
-<org.mozilla.gecko.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
-                                   android:id="@+id/client"
-                                   android:layout_width="fill_parent"
-                                   android:layout_height="@dimen/remote_tab_group_row_height"
-                                   style="@style/TabRowTextAppearance.Url"
-                                   android:background="@android:color/transparent"
-                                   android:paddingLeft="4dp"
-                                   android:paddingRight="4dp"
-                                   android:textStyle="bold"
-                                   android:textSize="14sp"
-                                   android:gravity="center_vertical"/>
+<org.mozilla.gecko.widget.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
+                                          android:id="@+id/client"
+                                          android:layout_width="fill_parent"
+                                          android:layout_height="@dimen/remote_tab_group_row_height"
+                                          style="@style/TabRowTextAppearance.Url"
+                                          android:background="@android:color/transparent"
+                                          android:paddingLeft="4dp"
+                                          android:paddingRight="4dp"
+                                          android:textStyle="bold"
+                                          android:textSize="14sp"
+                                          android:gravity="center_vertical"/>
diff --git a/mobile/android/base/resources/layout/search_engine_row.xml b/mobile/android/base/resources/layout/search_engine_row.xml
index 16f7b2ef9af9..103103813c31 100644
--- a/mobile/android/base/resources/layout/search_engine_row.xml
+++ b/mobile/android/base/resources/layout/search_engine_row.xml
@@ -14,17 +14,17 @@
                                           android:minWidth="@dimen/favicon_bg"
                                           android:minHeight="@dimen/favicon_bg"/>
 
-    <org.mozilla.gecko.FlowLayout android:id="@+id/suggestion_layout"
-                                  android:layout_toRightOf="@id/suggestion_icon"
-                                  android:layout_centerVertical="true"
-                                  android:layout_width="wrap_content"
-                                  android:layout_height="wrap_content"
-                                  android:layout_marginRight="10dip"
-                                  android:duplicateParentState="true">
+    <org.mozilla.gecko.widget.FlowLayout android:id="@+id/suggestion_layout"
+                                         android:layout_toRightOf="@id/suggestion_icon"
+                                         android:layout_centerVertical="true"
+                                         android:layout_width="wrap_content"
+                                         android:layout_height="wrap_content"
+                                         android:layout_marginRight="10dip"
+                                         android:duplicateParentState="true">
 
         <include layout="@layout/suggestion_item"
                  android:id="@+id/suggestion_user_entered"/>
 
-    </org.mozilla.gecko.FlowLayout>
+    </org.mozilla.gecko.widget.FlowLayout>
 
 </merge>
diff --git a/mobile/android/base/resources/layout/site_setting_item.xml b/mobile/android/base/resources/layout/site_setting_item.xml
index 6db490e40bba..a2f822f70f16 100644
--- a/mobile/android/base/resources/layout/site_setting_item.xml
+++ b/mobile/android/base/resources/layout/site_setting_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.mozilla.gecko.CheckableLinearLayout
+<org.mozilla.gecko.widget.CheckableLinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,4 +50,4 @@
         android:focusable="false"
         android:clickable="false"/>
 
-</org.mozilla.gecko.CheckableLinearLayout>
+</org.mozilla.gecko.widget.CheckableLinearLayout>
diff --git a/mobile/android/base/AllCapsTextView.java b/mobile/android/base/widget/AllCapsTextView.java
similarity index 94%
rename from mobile/android/base/AllCapsTextView.java
rename to mobile/android/base/widget/AllCapsTextView.java
index af497c95c34d..6bd1e36e46bd 100644
--- a/mobile/android/base/AllCapsTextView.java
+++ b/mobile/android/base/widget/AllCapsTextView.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.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/mobile/android/base/AnimatedHeightLayout.java b/mobile/android/base/widget/AnimatedHeightLayout.java
similarity index 98%
rename from mobile/android/base/AnimatedHeightLayout.java
rename to mobile/android/base/widget/AnimatedHeightLayout.java
index df8a6ef86d19..2339b68b20b5 100644
--- a/mobile/android/base/AnimatedHeightLayout.java
+++ b/mobile/android/base/widget/AnimatedHeightLayout.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.widget;
 
 import org.mozilla.gecko.animation.HeightChangeAnimation;
 
diff --git a/mobile/android/base/CheckableLinearLayout.java b/mobile/android/base/widget/CheckableLinearLayout.java
similarity index 78%
rename from mobile/android/base/CheckableLinearLayout.java
rename to mobile/android/base/widget/CheckableLinearLayout.java
index d58025c1cc83..c41faa40583b 100644
--- a/mobile/android/base/CheckableLinearLayout.java
+++ b/mobile/android/base/widget/CheckableLinearLayout.java
@@ -1,4 +1,10 @@
-package org.mozilla.gecko;
+/* 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/. */
+
+package org.mozilla.gecko.widget;
+
+import org.mozilla.gecko.R;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/mobile/android/base/ClickableWhenDisabledEditText.java b/mobile/android/base/widget/ClickableWhenDisabledEditText.java
similarity index 96%
rename from mobile/android/base/ClickableWhenDisabledEditText.java
rename to mobile/android/base/widget/ClickableWhenDisabledEditText.java
index ba73849e2305..206341212cf6 100644
--- a/mobile/android/base/ClickableWhenDisabledEditText.java
+++ b/mobile/android/base/widget/ClickableWhenDisabledEditText.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.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/mobile/android/base/FlowLayout.java b/mobile/android/base/widget/FlowLayout.java
similarity index 97%
rename from mobile/android/base/FlowLayout.java
rename to mobile/android/base/widget/FlowLayout.java
index e51695f8787f..042e748510aa 100644
--- a/mobile/android/base/FlowLayout.java
+++ b/mobile/android/base/widget/FlowLayout.java
@@ -2,7 +2,9 @@
  * 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.widget;
+
+import org.mozilla.gecko.R;
 
 import android.content.Context;
 import android.content.res.TypedArray;