gecko: changeset 596672:8f10e2a7a8d58a7d295eefb92cc9aaf71be9834f

rename from mobile/android/base/resources/anim/grow_fade_in.xml
rename to mobile/android/app/src/main/res/anim/grow_fade_in.xml

rename from mobile/android/base/resources/anim/overlay_check_entry.xml
rename to mobile/android/app/src/main/res/anim/overlay_check_entry.xml

rename from mobile/android/base/resources/anim/overlay_check_exit.xml
rename to mobile/android/app/src/main/res/anim/overlay_check_exit.xml

rename from mobile/android/base/resources/anim/overlay_pop.xml
rename to mobile/android/app/src/main/res/anim/overlay_pop.xml

rename from mobile/android/base/resources/anim/overlay_slide_down.xml
rename to mobile/android/app/src/main/res/anim/overlay_slide_down.xml

rename from mobile/android/base/resources/anim/overlay_slide_up.xml
rename to mobile/android/app/src/main/res/anim/overlay_slide_up.xml

rename from mobile/android/base/resources/anim/popup_hide.xml
rename to mobile/android/app/src/main/res/anim/popup_hide.xml

rename from mobile/android/base/resources/anim/popup_show.xml
rename to mobile/android/app/src/main/res/anim/popup_show.xml

rename from mobile/android/base/resources/color/action_bar_menu_item_colors.xml
rename to mobile/android/app/src/main/res/color/action_bar_menu_item_colors.xml

rename from mobile/android/base/resources/color/action_bar_secondary_menu_item_colors.xml
rename to mobile/android/app/src/main/res/color/action_bar_secondary_menu_item_colors.xml

rename from mobile/android/base/resources/color/facet_button_text_color.xml
rename to mobile/android/app/src/main/res/color/facet_button_text_color.xml

rename from mobile/android/base/resources/color/pressed_about_page_header_grey.xml
rename to mobile/android/app/src/main/res/color/pressed_about_page_header_grey.xml

rename from mobile/android/base/resources/color/primary_text.xml
rename to mobile/android/app/src/main/res/color/primary_text.xml

rename from mobile/android/base/resources/color/primary_text_selector.xml
rename to mobile/android/app/src/main/res/color/primary_text_selector.xml

rename from mobile/android/base/resources/color/recyclerview_selector.xml
rename to mobile/android/app/src/main/res/color/recyclerview_selector.xml

rename from mobile/android/base/resources/color/secondary_text.xml
rename to mobile/android/app/src/main/res/color/secondary_text.xml

rename from mobile/android/base/resources/color/select_item_multichoice.xml
rename to mobile/android/app/src/main/res/color/select_item_multichoice.xml

rename from mobile/android/base/resources/color/state_pressed_toolbar_grey_pressed.xml
rename to mobile/android/app/src/main/res/color/state_pressed_toolbar_grey_pressed.xml

rename from mobile/android/base/resources/color/tab_item_title.xml
rename to mobile/android/app/src/main/res/color/tab_item_title.xml

rename from mobile/android/base/resources/color/tab_new_tab_strip_colors.xml
rename to mobile/android/app/src/main/res/color/tab_new_tab_strip_colors.xml

rename from mobile/android/base/resources/color/tab_strip_item_bg.xml
rename to mobile/android/app/src/main/res/color/tab_strip_item_bg.xml

rename from mobile/android/base/resources/color/tab_strip_item_title.xml
rename to mobile/android/app/src/main/res/color/tab_strip_item_title.xml

rename from mobile/android/base/resources/color/tab_text_color.xml
rename to mobile/android/app/src/main/res/color/tab_text_color.xml

rename from mobile/android/base/resources/color/tabs_counter_text_color.xml
rename to mobile/android/app/src/main/res/color/tabs_counter_text_color.xml

rename from mobile/android/base/resources/color/tertiary_text.xml
rename to mobile/android/app/src/main/res/color/tertiary_text.xml

rename from mobile/android/base/resources/color/toolbar_display_layout_bg.xml
rename to mobile/android/app/src/main/res/color/toolbar_display_layout_bg.xml

rename from mobile/android/base/resources/color/top_sites_grid_item_title.xml
rename to mobile/android/app/src/main/res/color/top_sites_grid_item_title.xml

rename from mobile/android/base/resources/color/url_bar_title.xml
rename to mobile/android/app/src/main/res/color/url_bar_title.xml

rename from mobile/android/base/resources/color/url_bar_title_hint.xml
rename to mobile/android/app/src/main/res/color/url_bar_title_hint.xml

rename from mobile/android/base/resources/drawable-hdpi-v11/alert_camera.png
rename to mobile/android/app/src/main/res/drawable-hdpi-v11/alert_camera.png

rename from mobile/android/base/resources/drawable-hdpi-v11/alert_download.png
rename to mobile/android/app/src/main/res/drawable-hdpi-v11/alert_download.png

rename from mobile/android/base/resources/drawable-hdpi-v11/alert_guest.png
rename to mobile/android/app/src/main/res/drawable-hdpi-v11/alert_guest.png

rename from mobile/android/base/resources/drawable-hdpi-v11/alert_mic.png
rename to mobile/android/app/src/main/res/drawable-hdpi-v11/alert_mic.png

rename from mobile/android/base/resources/drawable-hdpi-v11/alert_mic_camera.png
rename to mobile/android/app/src/main/res/drawable-hdpi-v11/alert_mic_camera.png

rename from mobile/android/base/resources/drawable-hdpi-v11/ic_menu_back.png
rename to mobile/android/app/src/main/res/drawable-hdpi-v11/ic_menu_back.png

rename from mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_add.png
rename to mobile/android/app/src/main/res/drawable-hdpi-v11/ic_menu_bookmark_add.png

rename from mobile/android/base/resources/drawable-hdpi-v11/ic_menu_forward.png
rename to mobile/android/app/src/main/res/drawable-hdpi-v11/ic_menu_forward.png

rename from mobile/android/base/resources/drawable-hdpi-v11/ic_menu_reload.png
rename to mobile/android/app/src/main/res/drawable-hdpi-v11/ic_menu_reload.png

rename from mobile/android/base/resources/drawable-hdpi-v11/ic_menu_stop.png
rename to mobile/android/app/src/main/res/drawable-hdpi-v11/ic_menu_stop.png

rename from mobile/android/base/resources/drawable-hdpi-v11/ic_status_logo.png
rename to mobile/android/app/src/main/res/drawable-hdpi-v11/ic_status_logo.png

rename from mobile/android/base/resources/drawable-hdpi-v11/star_blue.png
rename to mobile/android/app/src/main/res/drawable-hdpi-v11/star_blue.png

rename from mobile/android/base/resources/drawable-hdpi/ab_add_search_engine.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ab_add_search_engine.png

rename from mobile/android/base/resources/drawable-hdpi/ab_copy.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ab_copy.png

rename from mobile/android/base/resources/drawable-hdpi/ab_cut.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ab_cut.png

rename from mobile/android/base/resources/drawable-hdpi/ab_done.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ab_done.png

rename from mobile/android/base/resources/drawable-hdpi/ab_menu.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ab_menu.png

rename from mobile/android/base/resources/drawable-hdpi/ab_mic.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ab_mic.png

rename from mobile/android/base/resources/drawable-hdpi/ab_paste.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ab_paste.png

rename from mobile/android/base/resources/drawable-hdpi/ab_qrcode.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ab_qrcode.png

rename from mobile/android/base/resources/drawable-hdpi/ab_search.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ab_search.png

rename from mobile/android/base/resources/drawable-hdpi/ab_select_all.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ab_select_all.png

rename from mobile/android/base/resources/drawable-hdpi/add_folder.png
rename to mobile/android/app/src/main/res/drawable-hdpi/add_folder.png

rename from mobile/android/base/resources/drawable-hdpi/alert_camera.png
rename to mobile/android/app/src/main/res/drawable-hdpi/alert_camera.png

rename from mobile/android/base/resources/drawable-hdpi/alert_download.png
rename to mobile/android/app/src/main/res/drawable-hdpi/alert_download.png

rename from mobile/android/base/resources/drawable-hdpi/alert_download_animation_1.png
rename to mobile/android/app/src/main/res/drawable-hdpi/alert_download_animation_1.png

rename from mobile/android/base/resources/drawable-hdpi/alert_download_animation_2.png
rename to mobile/android/app/src/main/res/drawable-hdpi/alert_download_animation_2.png

rename from mobile/android/base/resources/drawable-hdpi/alert_download_animation_3.png
rename to mobile/android/app/src/main/res/drawable-hdpi/alert_download_animation_3.png

rename from mobile/android/base/resources/drawable-hdpi/alert_download_animation_4.png
rename to mobile/android/app/src/main/res/drawable-hdpi/alert_download_animation_4.png

rename from mobile/android/base/resources/drawable-hdpi/alert_download_animation_5.png
rename to mobile/android/app/src/main/res/drawable-hdpi/alert_download_animation_5.png

rename from mobile/android/base/resources/drawable-hdpi/alert_download_animation_6.png
rename to mobile/android/app/src/main/res/drawable-hdpi/alert_download_animation_6.png

rename from mobile/android/base/resources/drawable-hdpi/alert_guest.png
rename to mobile/android/app/src/main/res/drawable-hdpi/alert_guest.png

rename from mobile/android/base/resources/drawable-hdpi/alert_mic.png
rename to mobile/android/app/src/main/res/drawable-hdpi/alert_mic.png

rename from mobile/android/base/resources/drawable-hdpi/alert_mic_camera.png
rename to mobile/android/app/src/main/res/drawable-hdpi/alert_mic_camera.png

rename from mobile/android/base/resources/drawable-hdpi/arrow.png
rename to mobile/android/app/src/main/res/drawable-hdpi/arrow.png

rename from mobile/android/base/resources/drawable-hdpi/arrow_up.png
rename to mobile/android/app/src/main/res/drawable-hdpi/arrow_up.png

rename from mobile/android/base/resources/drawable-hdpi/blank.png
rename to mobile/android/app/src/main/res/drawable-hdpi/blank.png

rename from mobile/android/base/resources/drawable-hdpi/casting.png
rename to mobile/android/app/src/main/res/drawable-hdpi/casting.png

rename from mobile/android/base/resources/drawable-hdpi/casting_active.png
rename to mobile/android/app/src/main/res/drawable-hdpi/casting_active.png

rename from mobile/android/base/resources/drawable-hdpi/close.png
rename to mobile/android/app/src/main/res/drawable-hdpi/close.png

rename from mobile/android/base/resources/drawable-hdpi/close_edit_mode_dark.png
rename to mobile/android/app/src/main/res/drawable-hdpi/close_edit_mode_dark.png

rename from mobile/android/base/resources/drawable-hdpi/close_edit_mode_light.png
rename to mobile/android/app/src/main/res/drawable-hdpi/close_edit_mode_light.png

rename from mobile/android/base/resources/drawable-hdpi/color_picker_row_bg.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/color_picker_row_bg.9.png

rename from mobile/android/base/resources/drawable-hdpi/device_desktop.png
rename to mobile/android/app/src/main/res/drawable-hdpi/device_desktop.png

rename from mobile/android/base/resources/drawable-hdpi/device_mobile.png
rename to mobile/android/app/src/main/res/drawable-hdpi/device_mobile.png

rename from mobile/android/base/resources/drawable-hdpi/dropshadow.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/dropshadow.9.png

rename from mobile/android/base/resources/drawable-hdpi/favicon_globe.png
rename to mobile/android/app/src/main/res/drawable-hdpi/favicon_globe.png

rename from mobile/android/base/resources/drawable-hdpi/find_close.png
rename to mobile/android/app/src/main/res/drawable-hdpi/find_close.png

rename from mobile/android/base/resources/drawable-hdpi/find_next.png
rename to mobile/android/app/src/main/res/drawable-hdpi/find_next.png

rename from mobile/android/base/resources/drawable-hdpi/find_prev.png
rename to mobile/android/app/src/main/res/drawable-hdpi/find_prev.png

rename from mobile/android/base/resources/drawable-hdpi/firefox_settings_alert.png
rename to mobile/android/app/src/main/res/drawable-hdpi/firefox_settings_alert.png

rename from mobile/android/base/resources/drawable-hdpi/flat_icon.png
rename to mobile/android/app/src/main/res/drawable-hdpi/flat_icon.png

rename from mobile/android/base/resources/drawable-hdpi/folder_closed.png
rename to mobile/android/app/src/main/res/drawable-hdpi/folder_closed.png

rename from mobile/android/base/resources/drawable-hdpi/foxfinder.webp
rename to mobile/android/app/src/main/res/drawable-hdpi/foxfinder.webp

rename from mobile/android/base/resources/drawable-hdpi/globe_light.png
rename to mobile/android/app/src/main/res/drawable-hdpi/globe_light.png

rename from mobile/android/base/resources/drawable-hdpi/grid_icon_bg_activated.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/grid_icon_bg_activated.9.png

rename from mobile/android/base/resources/drawable-hdpi/grid_icon_bg_focused.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/grid_icon_bg_focused.9.png

rename from mobile/android/base/resources/drawable-hdpi/handle_end.png
rename to mobile/android/app/src/main/res/drawable-hdpi/handle_end.png

rename from mobile/android/base/resources/drawable-hdpi/handle_middle.png
rename to mobile/android/app/src/main/res/drawable-hdpi/handle_middle.png

rename from mobile/android/base/resources/drawable-hdpi/handle_start.png
rename to mobile/android/app/src/main/res/drawable-hdpi/handle_start.png

rename from mobile/android/base/resources/drawable-hdpi/helper_readerview_bookmark.webp
rename to mobile/android/app/src/main/res/drawable-hdpi/helper_readerview_bookmark.webp

rename from mobile/android/base/resources/drawable-hdpi/home_bg.png
rename to mobile/android/app/src/main/res/drawable-hdpi/home_bg.png

rename from mobile/android/base/resources/drawable-hdpi/home_group_collapsed.png
rename to mobile/android/app/src/main/res/drawable-hdpi/home_group_collapsed.png

rename from mobile/android/base/resources/drawable-hdpi/home_star.png
rename to mobile/android/app/src/main/res/drawable-hdpi/home_star.png

rename from mobile/android/base/resources/drawable-hdpi/home_tab_menu_strip.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/home_tab_menu_strip.9.png

rename from mobile/android/base/resources/drawable-hdpi/homepage_banner_firstrun.png
rename to mobile/android/app/src/main/res/drawable-hdpi/homepage_banner_firstrun.png

rename from mobile/android/base/resources/drawable-hdpi/ic_action_settings.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_action_settings.png

rename from mobile/android/base/resources/drawable-hdpi/ic_media_pause.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_media_pause.png

rename from mobile/android/base/resources/drawable-hdpi/ic_media_play.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_media_play.png

rename from mobile/android/base/resources/drawable-hdpi/ic_menu_share.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_menu_share.png

rename from mobile/android/base/resources/drawable-hdpi/ic_status_logo.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_status_logo.png

rename from mobile/android/base/resources/drawable-hdpi/ic_url_bar_tab.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_url_bar_tab.png

rename from mobile/android/base/resources/drawable-hdpi/ic_widget_new_tab.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_widget_new_tab.png

rename from mobile/android/base/resources/drawable-hdpi/ic_widget_search.png
rename to mobile/android/app/src/main/res/drawable-hdpi/ic_widget_search.png

rename from mobile/android/base/resources/drawable-hdpi/icon_bookmarks_empty.png
rename to mobile/android/app/src/main/res/drawable-hdpi/icon_bookmarks_empty.png

rename from mobile/android/base/resources/drawable-hdpi/icon_home_empty_firefox.png
rename to mobile/android/app/src/main/res/drawable-hdpi/icon_home_empty_firefox.png

rename from mobile/android/base/resources/drawable-hdpi/icon_key.png
rename to mobile/android/app/src/main/res/drawable-hdpi/icon_key.png

rename from mobile/android/base/resources/drawable-hdpi/icon_most_recent_empty.png
rename to mobile/android/app/src/main/res/drawable-hdpi/icon_most_recent_empty.png

rename from mobile/android/base/resources/drawable-hdpi/icon_openinapp.png
rename to mobile/android/app/src/main/res/drawable-hdpi/icon_openinapp.png

rename from mobile/android/base/resources/drawable-hdpi/icon_pageaction.png
rename to mobile/android/app/src/main/res/drawable-hdpi/icon_pageaction.png

rename from mobile/android/base/resources/drawable-hdpi/icon_remote_tabs_empty.png
rename to mobile/android/app/src/main/res/drawable-hdpi/icon_remote_tabs_empty.png

rename from mobile/android/base/resources/drawable-hdpi/icon_search_empty_firefox.png
rename to mobile/android/app/src/main/res/drawable-hdpi/icon_search_empty_firefox.png

rename from mobile/android/base/resources/drawable-hdpi/icon_shareplane.png
rename to mobile/android/app/src/main/res/drawable-hdpi/icon_shareplane.png

rename from mobile/android/base/resources/drawable-hdpi/img_check.png
rename to mobile/android/app/src/main/res/drawable-hdpi/img_check.png

rename from mobile/android/base/resources/drawable-hdpi/location.png
rename to mobile/android/app/src/main/res/drawable-hdpi/location.png

rename from mobile/android/base/resources/drawable-hdpi/lock_disabled.png
rename to mobile/android/app/src/main/res/drawable-hdpi/lock_disabled.png

rename from mobile/android/base/resources/drawable-hdpi/lock_inactive.png
rename to mobile/android/app/src/main/res/drawable-hdpi/lock_inactive.png

rename from mobile/android/base/resources/drawable-hdpi/lock_secure.png
rename to mobile/android/app/src/main/res/drawable-hdpi/lock_secure.png

rename from mobile/android/base/resources/drawable-hdpi/media_bar_pause.png
rename to mobile/android/app/src/main/res/drawable-hdpi/media_bar_pause.png

rename from mobile/android/base/resources/drawable-hdpi/media_bar_play.png
rename to mobile/android/app/src/main/res/drawable-hdpi/media_bar_play.png

rename from mobile/android/base/resources/drawable-hdpi/media_bar_stop.png
rename to mobile/android/app/src/main/res/drawable-hdpi/media_bar_stop.png

rename from mobile/android/base/resources/drawable-hdpi/menu.png
rename to mobile/android/app/src/main/res/drawable-hdpi/menu.png

rename from mobile/android/base/resources/drawable-hdpi/menu_item_check.png
rename to mobile/android/app/src/main/res/drawable-hdpi/menu_item_check.png

rename from mobile/android/base/resources/drawable-hdpi/menu_item_more.png
rename to mobile/android/app/src/main/res/drawable-hdpi/menu_item_more.png

rename from mobile/android/base/resources/drawable-hdpi/menu_item_uncheck.png
rename to mobile/android/app/src/main/res/drawable-hdpi/menu_item_uncheck.png

rename from mobile/android/base/resources/drawable-hdpi/network_error.png
rename to mobile/android/app/src/main/res/drawable-hdpi/network_error.png

rename from mobile/android/base/resources/drawable-hdpi/notification_media.webp
rename to mobile/android/app/src/main/res/drawable-hdpi/notification_media.webp

rename from mobile/android/base/resources/drawable-hdpi/open_in_browser.png
rename to mobile/android/app/src/main/res/drawable-hdpi/open_in_browser.png

rename from mobile/android/base/resources/drawable-hdpi/orange_check.png
rename to mobile/android/app/src/main/res/drawable-hdpi/orange_check.png

rename from mobile/android/base/resources/drawable-hdpi/overlay_bookmark_icon.png
rename to mobile/android/app/src/main/res/drawable-hdpi/overlay_bookmark_icon.png

rename from mobile/android/base/resources/drawable-hdpi/overlay_bookmarked_already_icon.png
rename to mobile/android/app/src/main/res/drawable-hdpi/overlay_bookmarked_already_icon.png

rename from mobile/android/base/resources/drawable-hdpi/overlay_check.png
rename to mobile/android/app/src/main/res/drawable-hdpi/overlay_check.png

rename from mobile/android/base/resources/drawable-hdpi/pause.png
rename to mobile/android/app/src/main/res/drawable-hdpi/pause.png

rename from mobile/android/base/resources/drawable-hdpi/phone.png
rename to mobile/android/app/src/main/res/drawable-hdpi/phone.png

rename from mobile/android/base/resources/drawable-hdpi/play.png
rename to mobile/android/app/src/main/res/drawable-hdpi/play.png

rename from mobile/android/base/resources/drawable-hdpi/private_masq.png
rename to mobile/android/app/src/main/res/drawable-hdpi/private_masq.png

rename from mobile/android/base/resources/drawable-hdpi/progress.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/progress.9.png

rename from mobile/android/base/resources/drawable-hdpi/reader.png
rename to mobile/android/app/src/main/res/drawable-hdpi/reader.png

rename from mobile/android/base/resources/drawable-hdpi/reader_active.png
rename to mobile/android/app/src/main/res/drawable-hdpi/reader_active.png

rename from mobile/android/base/resources/drawable-hdpi/reading_list_folder.png
rename to mobile/android/app/src/main/res/drawable-hdpi/reading_list_folder.png

rename from mobile/android/base/resources/drawable-hdpi/search_clear.png
rename to mobile/android/app/src/main/res/drawable-hdpi/search_clear.png

rename from mobile/android/base/resources/drawable-hdpi/search_history.png
rename to mobile/android/app/src/main/res/drawable-hdpi/search_history.png

rename from mobile/android/base/resources/drawable-hdpi/search_icon_active.png
rename to mobile/android/app/src/main/res/drawable-hdpi/search_icon_active.png

rename from mobile/android/base/resources/drawable-hdpi/search_icon_inactive.png
rename to mobile/android/app/src/main/res/drawable-hdpi/search_icon_inactive.png

rename from mobile/android/base/resources/drawable-hdpi/search_launcher.png
rename to mobile/android/app/src/main/res/drawable-hdpi/search_launcher.png

rename from mobile/android/base/resources/drawable-hdpi/search_plus.png
rename to mobile/android/app/src/main/res/drawable-hdpi/search_plus.png

rename from mobile/android/base/resources/drawable-hdpi/settings_notifications.png
rename to mobile/android/app/src/main/res/drawable-hdpi/settings_notifications.png

rename from mobile/android/base/resources/drawable-hdpi/shareplane.png
rename to mobile/android/app/src/main/res/drawable-hdpi/shareplane.png

rename from mobile/android/base/resources/drawable-hdpi/shield_disabled.png
rename to mobile/android/app/src/main/res/drawable-hdpi/shield_disabled.png

rename from mobile/android/base/resources/drawable-hdpi/shield_enabled.png
rename to mobile/android/app/src/main/res/drawable-hdpi/shield_enabled.png

rename from mobile/android/base/resources/drawable-hdpi/status_icon_readercache.png
rename to mobile/android/app/src/main/res/drawable-hdpi/status_icon_readercache.png

rename from mobile/android/base/resources/drawable-hdpi/suggestedsites_amazon.png
rename to mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_amazon.png

rename from mobile/android/base/resources/drawable-hdpi/suggestedsites_facebook.png
rename to mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_facebook.png

rename from mobile/android/base/resources/drawable-hdpi/suggestedsites_twitter.png
rename to mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_twitter.png

rename from mobile/android/base/resources/drawable-hdpi/suggestedsites_wikipedia.png
rename to mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_wikipedia.png

rename from mobile/android/base/resources/drawable-hdpi/suggestedsites_youtube.png
rename to mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_youtube.png

rename from mobile/android/base/resources/drawable-hdpi/switch_button_icon.png
rename to mobile/android/app/src/main/res/drawable-hdpi/switch_button_icon.png

rename from mobile/android/base/resources/drawable-hdpi/tab_audio_playing.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tab_audio_playing.png

rename from mobile/android/base/resources/drawable-hdpi/tab_close.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tab_close.png

rename from mobile/android/base/resources/drawable-hdpi/tab_close_active.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tab_close_active.png

rename from mobile/android/base/resources/drawable-hdpi/tab_indicator_background.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tab_indicator_background.9.png

rename from mobile/android/base/resources/drawable-hdpi/tab_indicator_divider.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tab_indicator_divider.9.png

rename from mobile/android/base/resources/drawable-hdpi/tab_indicator_selected.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tab_indicator_selected.9.png

rename from mobile/android/base/resources/drawable-hdpi/tab_indicator_selected_focused.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tab_indicator_selected_focused.9.png

rename from mobile/android/base/resources/drawable-hdpi/tab_new.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tab_new.png

rename from mobile/android/base/resources/drawable-hdpi/tab_preview_masq.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tab_preview_masq.png

rename from mobile/android/base/resources/drawable-hdpi/tabs_count.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tabs_count.png

rename from mobile/android/base/resources/drawable-hdpi/tabs_count_foreground.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tabs_count_foreground.png

rename from mobile/android/base/resources/drawable-hdpi/tabs_normal.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tabs_normal.png

rename from mobile/android/base/resources/drawable-hdpi/tabs_panel_nav_back.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tabs_panel_nav_back.png

rename from mobile/android/base/resources/drawable-hdpi/tabs_private.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tabs_private.png

rename from mobile/android/base/resources/drawable-hdpi/tip_addsearch.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tip_addsearch.png

rename from mobile/android/base/resources/drawable-hdpi/top_site_add.png
rename to mobile/android/app/src/main/res/drawable-hdpi/top_site_add.png

rename from mobile/android/base/resources/drawable-hdpi/tracking_protection_toolbar_illustration.png
rename to mobile/android/app/src/main/res/drawable-hdpi/tracking_protection_toolbar_illustration.png

rename from mobile/android/base/resources/drawable-hdpi/undo_button_icon.png
rename to mobile/android/app/src/main/res/drawable-hdpi/undo_button_icon.png

rename from mobile/android/base/resources/drawable-hdpi/url_bar_entry_default.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/url_bar_entry_default.9.png

rename from mobile/android/base/resources/drawable-hdpi/url_bar_entry_default_pb.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/url_bar_entry_default_pb.9.png

rename from mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/url_bar_entry_pressed.9.png

rename from mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed_pb.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/url_bar_entry_pressed_pb.9.png

rename from mobile/android/base/resources/drawable-hdpi/urlbar_stop.png
rename to mobile/android/app/src/main/res/drawable-hdpi/urlbar_stop.png

rename from mobile/android/base/resources/drawable-hdpi/validation_arrow.png
rename to mobile/android/app/src/main/res/drawable-hdpi/validation_arrow.png

rename from mobile/android/base/resources/drawable-hdpi/validation_arrow_inverted.png
rename to mobile/android/app/src/main/res/drawable-hdpi/validation_arrow_inverted.png

rename from mobile/android/base/resources/drawable-hdpi/validation_bg.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/validation_bg.9.png

rename from mobile/android/base/resources/drawable-hdpi/warning_major.png
rename to mobile/android/app/src/main/res/drawable-hdpi/warning_major.png

rename from mobile/android/base/resources/drawable-hdpi/warning_minor.png
rename to mobile/android/app/src/main/res/drawable-hdpi/warning_minor.png

rename from mobile/android/base/resources/drawable-hdpi/widget_bg.9.png
rename to mobile/android/app/src/main/res/drawable-hdpi/widget_bg.9.png

rename from mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_back.png
rename to mobile/android/app/src/main/res/drawable-large-hdpi-v11/ic_menu_back.png

rename from mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_forward.png
rename to mobile/android/app/src/main/res/drawable-large-hdpi-v11/ic_menu_forward.png

rename from mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_reload.png
rename to mobile/android/app/src/main/res/drawable-large-hdpi-v11/ic_menu_reload.png

rename from mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_stop.png
rename to mobile/android/app/src/main/res/drawable-large-hdpi-v11/ic_menu_stop.png

rename from mobile/android/base/resources/drawable-large-hdpi-v11/tabs_count.png
rename to mobile/android/app/src/main/res/drawable-large-hdpi-v11/tabs_count.png

rename from mobile/android/base/resources/drawable-large-hdpi-v11/tabs_count_foreground.png
rename to mobile/android/app/src/main/res/drawable-large-hdpi-v11/tabs_count_foreground.png

rename from mobile/android/base/resources/drawable-large-hdpi-v11/toolbar_favicon_default.png
rename to mobile/android/app/src/main/res/drawable-large-hdpi-v11/toolbar_favicon_default.png

rename from mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_default.9.png
rename to mobile/android/app/src/main/res/drawable-large-hdpi-v11/url_bar_entry_default.9.png

rename from mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_default_pb.9.png
rename to mobile/android/app/src/main/res/drawable-large-hdpi-v11/url_bar_entry_default_pb.9.png

rename from mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_pressed.9.png
rename to mobile/android/app/src/main/res/drawable-large-hdpi-v11/url_bar_entry_pressed.9.png

rename from mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_pressed_pb.9.png
rename to mobile/android/app/src/main/res/drawable-large-hdpi-v11/url_bar_entry_pressed_pb.9.png

rename from mobile/android/base/resources/drawable-large-v11/browser_toolbar_action_bar_button.xml
rename to mobile/android/app/src/main/res/drawable-large-v11/browser_toolbar_action_bar_button.xml

rename from mobile/android/base/resources/drawable-large-v11/url_bar_nav_button.xml
rename to mobile/android/app/src/main/res/drawable-large-v11/url_bar_nav_button.xml

rename from mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_back.png
rename to mobile/android/app/src/main/res/drawable-large-xhdpi-v11/ic_menu_back.png

rename from mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_forward.png
rename to mobile/android/app/src/main/res/drawable-large-xhdpi-v11/ic_menu_forward.png

rename from mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_reload.png
rename to mobile/android/app/src/main/res/drawable-large-xhdpi-v11/ic_menu_reload.png

rename from mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_stop.png
rename to mobile/android/app/src/main/res/drawable-large-xhdpi-v11/ic_menu_stop.png

rename from mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_count.png
rename to mobile/android/app/src/main/res/drawable-large-xhdpi-v11/tabs_count.png

rename from mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_count_foreground.png
rename to mobile/android/app/src/main/res/drawable-large-xhdpi-v11/tabs_count_foreground.png

rename from mobile/android/base/resources/drawable-large-xhdpi-v11/toolbar_favicon_default.png
rename to mobile/android/app/src/main/res/drawable-large-xhdpi-v11/toolbar_favicon_default.png

rename from mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_default.9.png
rename to mobile/android/app/src/main/res/drawable-large-xhdpi-v11/url_bar_entry_default.9.png

rename from mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_default_pb.9.png
rename to mobile/android/app/src/main/res/drawable-large-xhdpi-v11/url_bar_entry_default_pb.9.png

rename from mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_pressed.9.png
rename to mobile/android/app/src/main/res/drawable-large-xhdpi-v11/url_bar_entry_pressed.9.png

rename from mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_pressed_pb.9.png
rename to mobile/android/app/src/main/res/drawable-large-xhdpi-v11/url_bar_entry_pressed_pb.9.png

rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_back.png
rename to mobile/android/app/src/main/res/drawable-large-xxhdpi-v11/ic_menu_back.png

rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_forward.png
rename to mobile/android/app/src/main/res/drawable-large-xxhdpi-v11/ic_menu_forward.png

rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_reload.png
rename to mobile/android/app/src/main/res/drawable-large-xxhdpi-v11/ic_menu_reload.png

rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/ic_menu_stop.png
rename to mobile/android/app/src/main/res/drawable-large-xxhdpi-v11/ic_menu_stop.png

rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/tabs_count.png
rename to mobile/android/app/src/main/res/drawable-large-xxhdpi-v11/tabs_count.png

rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/tabs_count_foreground.png
rename to mobile/android/app/src/main/res/drawable-large-xxhdpi-v11/tabs_count_foreground.png

rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/toolbar_favicon_default.png
rename to mobile/android/app/src/main/res/drawable-large-xxhdpi-v11/toolbar_favicon_default.png

rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_default.9.png
rename to mobile/android/app/src/main/res/drawable-large-xxhdpi-v11/url_bar_entry_default.9.png

rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_default_pb.9.png
rename to mobile/android/app/src/main/res/drawable-large-xxhdpi-v11/url_bar_entry_default_pb.9.png

rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_pressed.9.png
rename to mobile/android/app/src/main/res/drawable-large-xxhdpi-v11/url_bar_entry_pressed.9.png

rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_pressed_pb.9.png
rename to mobile/android/app/src/main/res/drawable-large-xxhdpi-v11/url_bar_entry_pressed_pb.9.png

rename from mobile/android/base/resources/drawable-ldrtl-hdpi/arrow.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-hdpi/arrow.png

rename from mobile/android/base/resources/drawable-ldrtl-hdpi/home_group_collapsed.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-hdpi/home_group_collapsed.png

rename from mobile/android/base/resources/drawable-ldrtl-hdpi/ic_menu_back.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-hdpi/ic_menu_back.png

rename from mobile/android/base/resources/drawable-ldrtl-hdpi/ic_menu_forward.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-hdpi/ic_menu_forward.png

rename from mobile/android/base/resources/drawable-ldrtl-hdpi/menu_item_more.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-hdpi/menu_item_more.png

rename from mobile/android/base/resources/drawable-ldrtl-hdpi/progress.9.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-hdpi/progress.9.png

rename from mobile/android/base/resources/drawable-ldrtl-hdpi/tabs_panel_nav_back.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-hdpi/tabs_panel_nav_back.png

rename from mobile/android/base/resources/drawable-ldrtl-large-hdpi/ic_menu_back.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-large-hdpi/ic_menu_back.png

rename from mobile/android/base/resources/drawable-ldrtl-large-hdpi/ic_menu_forward.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-large-hdpi/ic_menu_forward.png

rename from mobile/android/base/resources/drawable-ldrtl-large-xhdpi/ic_menu_back.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-large-xhdpi/ic_menu_back.png

rename from mobile/android/base/resources/drawable-ldrtl-large-xhdpi/ic_menu_forward.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-large-xhdpi/ic_menu_forward.png

rename from mobile/android/base/resources/drawable-ldrtl-large-xxhdpi/ic_menu_back.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-large-xxhdpi/ic_menu_back.png

rename from mobile/android/base/resources/drawable-ldrtl-large-xxhdpi/ic_menu_forward.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-large-xxhdpi/ic_menu_forward.png

rename from mobile/android/base/resources/drawable-ldrtl-xhdpi/arrow.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-xhdpi/arrow.png

rename from mobile/android/base/resources/drawable-ldrtl-xhdpi/home_group_collapsed.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-xhdpi/home_group_collapsed.png

rename from mobile/android/base/resources/drawable-ldrtl-xhdpi/ic_menu_back.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-xhdpi/ic_menu_back.png

rename from mobile/android/base/resources/drawable-ldrtl-xhdpi/ic_menu_forward.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-xhdpi/ic_menu_forward.png

rename from mobile/android/base/resources/drawable-ldrtl-xhdpi/menu_item_more.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-xhdpi/menu_item_more.png

rename from mobile/android/base/resources/drawable-ldrtl-xhdpi/progress.9.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-xhdpi/progress.9.png

rename from mobile/android/base/resources/drawable-ldrtl-xhdpi/tabs_panel_nav_back.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-xhdpi/tabs_panel_nav_back.png

rename from mobile/android/base/resources/drawable-ldrtl-xxhdpi/arrow.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-xxhdpi/arrow.png

rename from mobile/android/base/resources/drawable-ldrtl-xxhdpi/home_group_collapsed.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-xxhdpi/home_group_collapsed.png

rename from mobile/android/base/resources/drawable-ldrtl-xxhdpi/tabs_panel_nav_back.png
rename to mobile/android/app/src/main/res/drawable-ldrtl-xxhdpi/tabs_panel_nav_back.png

rename from mobile/android/base/resources/drawable-nodpi/cloud.png
rename to mobile/android/app/src/main/res/drawable-nodpi/cloud.png

rename from mobile/android/base/resources/drawable-nodpi/firstrun_account.webp
rename to mobile/android/app/src/main/res/drawable-nodpi/firstrun_account.webp

rename from mobile/android/base/resources/drawable-nodpi/firstrun_bookmarks.webp
rename to mobile/android/app/src/main/res/drawable-nodpi/firstrun_bookmarks.webp

rename from mobile/android/base/resources/drawable-nodpi/firstrun_data_off.webp
rename to mobile/android/app/src/main/res/drawable-nodpi/firstrun_data_off.webp

rename from mobile/android/base/resources/drawable-nodpi/firstrun_data_on.webp
rename to mobile/android/app/src/main/res/drawable-nodpi/firstrun_data_on.webp

rename from mobile/android/base/resources/drawable-nodpi/firstrun_readerview.webp
rename to mobile/android/app/src/main/res/drawable-nodpi/firstrun_readerview.webp

rename from mobile/android/base/resources/drawable-nodpi/firstrun_signin.webp
rename to mobile/android/app/src/main/res/drawable-nodpi/firstrun_signin.webp

rename from mobile/android/base/resources/drawable-nodpi/firstrun_sync.webp
rename to mobile/android/app/src/main/res/drawable-nodpi/firstrun_sync.webp

rename from mobile/android/base/resources/drawable-nodpi/firstrun_tabqueue_off.png
rename to mobile/android/app/src/main/res/drawable-nodpi/firstrun_tabqueue_off.png

rename from mobile/android/base/resources/drawable-nodpi/firstrun_tabqueue_on.webp
rename to mobile/android/app/src/main/res/drawable-nodpi/firstrun_tabqueue_on.webp

rename from mobile/android/base/resources/drawable-nodpi/firstrun_urlbar.webp
rename to mobile/android/app/src/main/res/drawable-nodpi/firstrun_urlbar.webp

rename from mobile/android/base/resources/drawable-nodpi/icon_recent.png
rename to mobile/android/app/src/main/res/drawable-nodpi/icon_recent.png

rename from mobile/android/base/resources/drawable-v12/toast_button_background.xml
rename to mobile/android/app/src/main/res/drawable-v12/toast_button_background.xml

rename from mobile/android/base/resources/drawable-v17/url_bar_translating_edge.xml
rename to mobile/android/app/src/main/res/drawable-v17/url_bar_translating_edge.xml

rename from mobile/android/base/resources/drawable-v21/logo.xml
rename to mobile/android/app/src/main/res/drawable-v21/logo.xml

rename from mobile/android/base/resources/drawable-xhdpi-v11/alert_camera.png
rename to mobile/android/app/src/main/res/drawable-xhdpi-v11/alert_camera.png

rename from mobile/android/base/resources/drawable-xhdpi-v11/alert_download.png
rename to mobile/android/app/src/main/res/drawable-xhdpi-v11/alert_download.png

rename from mobile/android/base/resources/drawable-xhdpi-v11/alert_guest.png
rename to mobile/android/app/src/main/res/drawable-xhdpi-v11/alert_guest.png

rename from mobile/android/base/resources/drawable-xhdpi-v11/alert_mic.png
rename to mobile/android/app/src/main/res/drawable-xhdpi-v11/alert_mic.png

rename from mobile/android/base/resources/drawable-xhdpi-v11/alert_mic_camera.png
rename to mobile/android/app/src/main/res/drawable-xhdpi-v11/alert_mic_camera.png

rename from mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_back.png
rename to mobile/android/app/src/main/res/drawable-xhdpi-v11/ic_menu_back.png

rename from mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_add.png
rename to mobile/android/app/src/main/res/drawable-xhdpi-v11/ic_menu_bookmark_add.png

rename from mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_forward.png
rename to mobile/android/app/src/main/res/drawable-xhdpi-v11/ic_menu_forward.png

rename from mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_reload.png
rename to mobile/android/app/src/main/res/drawable-xhdpi-v11/ic_menu_reload.png

rename from mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_stop.png
rename to mobile/android/app/src/main/res/drawable-xhdpi-v11/ic_menu_stop.png

rename from mobile/android/base/resources/drawable-xhdpi-v11/ic_status_logo.png
rename to mobile/android/app/src/main/res/drawable-xhdpi-v11/ic_status_logo.png

rename from mobile/android/base/resources/drawable-xhdpi-v11/star_blue.png
rename to mobile/android/app/src/main/res/drawable-xhdpi-v11/star_blue.png

rename from mobile/android/base/resources/drawable-xhdpi/ab_add_search_engine.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ab_add_search_engine.png

rename from mobile/android/base/resources/drawable-xhdpi/ab_copy.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ab_copy.png

rename from mobile/android/base/resources/drawable-xhdpi/ab_cut.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ab_cut.png

rename from mobile/android/base/resources/drawable-xhdpi/ab_done.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ab_done.png

rename from mobile/android/base/resources/drawable-xhdpi/ab_menu.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ab_menu.png

rename from mobile/android/base/resources/drawable-xhdpi/ab_mic.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ab_mic.png

rename from mobile/android/base/resources/drawable-xhdpi/ab_paste.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ab_paste.png

rename from mobile/android/base/resources/drawable-xhdpi/ab_qrcode.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ab_qrcode.png

rename from mobile/android/base/resources/drawable-xhdpi/ab_search.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ab_search.png

rename from mobile/android/base/resources/drawable-xhdpi/ab_select_all.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ab_select_all.png

rename from mobile/android/base/resources/drawable-xhdpi/add_folder.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/add_folder.png

rename from mobile/android/base/resources/drawable-xhdpi/alert_camera.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/alert_camera.png

rename from mobile/android/base/resources/drawable-xhdpi/alert_download.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/alert_download.png

rename from mobile/android/base/resources/drawable-xhdpi/alert_download_animation_1.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/alert_download_animation_1.png

rename from mobile/android/base/resources/drawable-xhdpi/alert_download_animation_2.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/alert_download_animation_2.png

rename from mobile/android/base/resources/drawable-xhdpi/alert_download_animation_3.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/alert_download_animation_3.png

rename from mobile/android/base/resources/drawable-xhdpi/alert_download_animation_4.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/alert_download_animation_4.png

rename from mobile/android/base/resources/drawable-xhdpi/alert_download_animation_5.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/alert_download_animation_5.png

rename from mobile/android/base/resources/drawable-xhdpi/alert_download_animation_6.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/alert_download_animation_6.png

rename from mobile/android/base/resources/drawable-xhdpi/alert_guest.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/alert_guest.png

rename from mobile/android/base/resources/drawable-xhdpi/alert_mic.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/alert_mic.png

rename from mobile/android/base/resources/drawable-xhdpi/alert_mic_camera.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/alert_mic_camera.png

rename from mobile/android/base/resources/drawable-xhdpi/arrow.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/arrow.png

rename from mobile/android/base/resources/drawable-xhdpi/arrow_up.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/arrow_up.png

rename from mobile/android/base/resources/drawable-xhdpi/blank.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/blank.png

rename from mobile/android/base/resources/drawable-xhdpi/casting.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/casting.png

rename from mobile/android/base/resources/drawable-xhdpi/casting_active.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/casting_active.png

rename from mobile/android/base/resources/drawable-xhdpi/close.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/close.png

rename from mobile/android/base/resources/drawable-xhdpi/close_edit_mode_dark.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/close_edit_mode_dark.png

rename from mobile/android/base/resources/drawable-xhdpi/close_edit_mode_light.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/close_edit_mode_light.png

rename from mobile/android/base/resources/drawable-xhdpi/color_picker_row_bg.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/color_picker_row_bg.9.png

rename from mobile/android/base/resources/drawable-xhdpi/device_desktop.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/device_desktop.png

rename from mobile/android/base/resources/drawable-xhdpi/device_mobile.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/device_mobile.png

rename from mobile/android/base/resources/drawable-xhdpi/dropshadow.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/dropshadow.9.png

rename from mobile/android/base/resources/drawable-xhdpi/favicon_globe.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/favicon_globe.png

rename from mobile/android/base/resources/drawable-xhdpi/find_close.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/find_close.png

rename from mobile/android/base/resources/drawable-xhdpi/find_next.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/find_next.png

rename from mobile/android/base/resources/drawable-xhdpi/find_prev.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/find_prev.png

rename from mobile/android/base/resources/drawable-xhdpi/firefox_settings_alert.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/firefox_settings_alert.png

rename from mobile/android/base/resources/drawable-xhdpi/flat_icon.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/flat_icon.png

rename from mobile/android/base/resources/drawable-xhdpi/folder_closed.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/folder_closed.png

rename from mobile/android/base/resources/drawable-xhdpi/foxfinder.webp
rename to mobile/android/app/src/main/res/drawable-xhdpi/foxfinder.webp

rename from mobile/android/base/resources/drawable-xhdpi/globe_light.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/globe_light.png

rename from mobile/android/base/resources/drawable-xhdpi/grid_icon_bg_activated.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/grid_icon_bg_activated.9.png

rename from mobile/android/base/resources/drawable-xhdpi/grid_icon_bg_focused.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/grid_icon_bg_focused.9.png

rename from mobile/android/base/resources/drawable-xhdpi/handle_end.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/handle_end.png

rename from mobile/android/base/resources/drawable-xhdpi/handle_middle.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/handle_middle.png

rename from mobile/android/base/resources/drawable-xhdpi/handle_start.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/handle_start.png

rename from mobile/android/base/resources/drawable-xhdpi/helper_readerview_bookmark.webp
rename to mobile/android/app/src/main/res/drawable-xhdpi/helper_readerview_bookmark.webp

rename from mobile/android/base/resources/drawable-xhdpi/home_group_collapsed.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/home_group_collapsed.png

rename from mobile/android/base/resources/drawable-xhdpi/home_tab_menu_strip.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/home_tab_menu_strip.9.png

rename from mobile/android/base/resources/drawable-xhdpi/homepage_banner_firstrun.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/homepage_banner_firstrun.png

rename from mobile/android/base/resources/drawable-xhdpi/ic_action_settings.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_action_settings.png

rename from mobile/android/base/resources/drawable-xhdpi/ic_media_pause.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_media_pause.png

rename from mobile/android/base/resources/drawable-xhdpi/ic_media_play.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_media_play.png

rename from mobile/android/base/resources/drawable-xhdpi/ic_menu_share.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_menu_share.png

rename from mobile/android/base/resources/drawable-xhdpi/ic_status_logo.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_status_logo.png

rename from mobile/android/base/resources/drawable-xhdpi/ic_url_bar_tab.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_url_bar_tab.png

rename from mobile/android/base/resources/drawable-xhdpi/ic_widget_new_tab.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_widget_new_tab.png

rename from mobile/android/base/resources/drawable-xhdpi/ic_widget_search.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/ic_widget_search.png

rename from mobile/android/base/resources/drawable-xhdpi/icon_bookmarks_empty.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/icon_bookmarks_empty.png

rename from mobile/android/base/resources/drawable-xhdpi/icon_home_empty_firefox.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/icon_home_empty_firefox.png

rename from mobile/android/base/resources/drawable-xhdpi/icon_key.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/icon_key.png

rename from mobile/android/base/resources/drawable-xhdpi/icon_most_recent_empty.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/icon_most_recent_empty.png

rename from mobile/android/base/resources/drawable-xhdpi/icon_openinapp.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/icon_openinapp.png

rename from mobile/android/base/resources/drawable-xhdpi/icon_pageaction.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/icon_pageaction.png

rename from mobile/android/base/resources/drawable-xhdpi/icon_remote_tabs_empty.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/icon_remote_tabs_empty.png

rename from mobile/android/base/resources/drawable-xhdpi/icon_search_empty_firefox.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/icon_search_empty_firefox.png

rename from mobile/android/base/resources/drawable-xhdpi/icon_shareplane.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/icon_shareplane.png

rename from mobile/android/base/resources/drawable-xhdpi/img_check.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/img_check.png

rename from mobile/android/base/resources/drawable-xhdpi/location.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/location.png

rename from mobile/android/base/resources/drawable-xhdpi/lock_disabled.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/lock_disabled.png

rename from mobile/android/base/resources/drawable-xhdpi/lock_inactive.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/lock_inactive.png

rename from mobile/android/base/resources/drawable-xhdpi/lock_secure.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/lock_secure.png

rename from mobile/android/base/resources/drawable-xhdpi/media_bar_pause.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/media_bar_pause.png

rename from mobile/android/base/resources/drawable-xhdpi/media_bar_play.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/media_bar_play.png

rename from mobile/android/base/resources/drawable-xhdpi/media_bar_stop.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/media_bar_stop.png

rename from mobile/android/base/resources/drawable-xhdpi/menu.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/menu.png

rename from mobile/android/base/resources/drawable-xhdpi/menu_item_check.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/menu_item_check.png

rename from mobile/android/base/resources/drawable-xhdpi/menu_item_more.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/menu_item_more.png

rename from mobile/android/base/resources/drawable-xhdpi/menu_item_uncheck.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/menu_item_uncheck.png

rename from mobile/android/base/resources/drawable-xhdpi/network_error.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/network_error.png

rename from mobile/android/base/resources/drawable-xhdpi/notification_media.webp
rename to mobile/android/app/src/main/res/drawable-xhdpi/notification_media.webp

rename from mobile/android/base/resources/drawable-xhdpi/open_in_browser.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/open_in_browser.png

rename from mobile/android/base/resources/drawable-xhdpi/orange_check.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/orange_check.png

rename from mobile/android/base/resources/drawable-xhdpi/overlay_bookmark_icon.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/overlay_bookmark_icon.png

rename from mobile/android/base/resources/drawable-xhdpi/overlay_bookmarked_already_icon.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/overlay_bookmarked_already_icon.png

rename from mobile/android/base/resources/drawable-xhdpi/overlay_check.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/overlay_check.png

rename from mobile/android/base/resources/drawable-xhdpi/pause.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/pause.png

rename from mobile/android/base/resources/drawable-xhdpi/phone.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/phone.png

rename from mobile/android/base/resources/drawable-xhdpi/play.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/play.png

rename from mobile/android/base/resources/drawable-xhdpi/private_masq.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/private_masq.png

rename from mobile/android/base/resources/drawable-xhdpi/progress.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/progress.9.png

rename from mobile/android/base/resources/drawable-xhdpi/push_notification.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/push_notification.png

rename from mobile/android/base/resources/drawable-xhdpi/reader.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/reader.png

rename from mobile/android/base/resources/drawable-xhdpi/reader_active.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/reader_active.png

rename from mobile/android/base/resources/drawable-xhdpi/reading_list_folder.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/reading_list_folder.png

rename from mobile/android/base/resources/drawable-xhdpi/search_clear.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/search_clear.png

rename from mobile/android/base/resources/drawable-xhdpi/search_history.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/search_history.png

rename from mobile/android/base/resources/drawable-xhdpi/search_icon_active.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/search_icon_active.png

rename from mobile/android/base/resources/drawable-xhdpi/search_icon_inactive.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/search_icon_inactive.png

rename from mobile/android/base/resources/drawable-xhdpi/search_launcher.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/search_launcher.png

rename from mobile/android/base/resources/drawable-xhdpi/search_plus.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/search_plus.png

rename from mobile/android/base/resources/drawable-xhdpi/settings_notifications.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/settings_notifications.png

rename from mobile/android/base/resources/drawable-xhdpi/shareplane.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/shareplane.png

rename from mobile/android/base/resources/drawable-xhdpi/shield_disabled.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/shield_disabled.png

rename from mobile/android/base/resources/drawable-xhdpi/shield_enabled.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/shield_enabled.png

rename from mobile/android/base/resources/drawable-xhdpi/status_icon_readercache.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/status_icon_readercache.png

rename from mobile/android/base/resources/drawable-xhdpi/suggestedsites_amazon.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_amazon.png

rename from mobile/android/base/resources/drawable-xhdpi/suggestedsites_facebook.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_facebook.png

rename from mobile/android/base/resources/drawable-xhdpi/suggestedsites_restricted_fxsupport.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_restricted_fxsupport.png

rename from mobile/android/base/resources/drawable-xhdpi/suggestedsites_restricted_mozilla.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_restricted_mozilla.png

rename from mobile/android/base/resources/drawable-xhdpi/suggestedsites_twitter.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_twitter.png

rename from mobile/android/base/resources/drawable-xhdpi/suggestedsites_webmaker.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_webmaker.png

rename from mobile/android/base/resources/drawable-xhdpi/suggestedsites_wikipedia.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_wikipedia.png

rename from mobile/android/base/resources/drawable-xhdpi/suggestedsites_youtube.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_youtube.png

rename from mobile/android/base/resources/drawable-xhdpi/switch_button_icon.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/switch_button_icon.png

rename from mobile/android/base/resources/drawable-xhdpi/tab_audio_playing.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tab_audio_playing.png

rename from mobile/android/base/resources/drawable-xhdpi/tab_close.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tab_close.png

rename from mobile/android/base/resources/drawable-xhdpi/tab_close_active.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tab_close_active.png

rename from mobile/android/base/resources/drawable-xhdpi/tab_indicator_background.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tab_indicator_background.9.png

rename from mobile/android/base/resources/drawable-xhdpi/tab_indicator_divider.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tab_indicator_divider.9.png

rename from mobile/android/base/resources/drawable-xhdpi/tab_indicator_selected.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tab_indicator_selected.9.png

rename from mobile/android/base/resources/drawable-xhdpi/tab_indicator_selected_focused.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tab_indicator_selected_focused.9.png

rename from mobile/android/base/resources/drawable-xhdpi/tab_new.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tab_new.png

rename from mobile/android/base/resources/drawable-xhdpi/tab_preview_masq.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tab_preview_masq.png

rename from mobile/android/base/resources/drawable-xhdpi/tabs_count.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tabs_count.png

rename from mobile/android/base/resources/drawable-xhdpi/tabs_count_foreground.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tabs_count_foreground.png

rename from mobile/android/base/resources/drawable-xhdpi/tabs_normal.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tabs_normal.png

rename from mobile/android/base/resources/drawable-xhdpi/tabs_panel_nav_back.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tabs_panel_nav_back.png

rename from mobile/android/base/resources/drawable-xhdpi/tabs_private.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tabs_private.png

rename from mobile/android/base/resources/drawable-xhdpi/tip_addsearch.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tip_addsearch.png

rename from mobile/android/base/resources/drawable-xhdpi/top_site_add.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/top_site_add.png

rename from mobile/android/base/resources/drawable-xhdpi/tracking_protection_toolbar_illustration.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/tracking_protection_toolbar_illustration.png

rename from mobile/android/base/resources/drawable-xhdpi/undo_button_icon.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/undo_button_icon.png

rename from mobile/android/base/resources/drawable-xhdpi/url_bar_entry_default.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/url_bar_entry_default.9.png

rename from mobile/android/base/resources/drawable-xhdpi/url_bar_entry_default_pb.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/url_bar_entry_default_pb.9.png

rename from mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/url_bar_entry_pressed.9.png

rename from mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed_pb.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/url_bar_entry_pressed_pb.9.png

rename from mobile/android/base/resources/drawable-xhdpi/urlbar_stop.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/urlbar_stop.png

rename from mobile/android/base/resources/drawable-xhdpi/validation_arrow.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/validation_arrow.png

rename from mobile/android/base/resources/drawable-xhdpi/validation_arrow_inverted.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/validation_arrow_inverted.png

rename from mobile/android/base/resources/drawable-xhdpi/validation_bg.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/validation_bg.9.png

rename from mobile/android/base/resources/drawable-xhdpi/warning_major.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/warning_major.png

rename from mobile/android/base/resources/drawable-xhdpi/warning_minor.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/warning_minor.png

rename from mobile/android/base/resources/drawable-xhdpi/widget_bg.9.png
rename to mobile/android/app/src/main/res/drawable-xhdpi/widget_bg.9.png

rename from mobile/android/base/resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_add.png
rename to mobile/android/app/src/main/res/drawable-xlarge-hdpi-v11/ic_menu_bookmark_add.png

rename from mobile/android/base/resources/drawable-xlarge-hdpi-v11/star_blue.png
rename to mobile/android/app/src/main/res/drawable-xlarge-hdpi-v11/star_blue.png

rename from mobile/android/base/resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.png
rename to mobile/android/app/src/main/res/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.png

rename from mobile/android/base/resources/drawable-xlarge-xhdpi-v11/star_blue.png
rename to mobile/android/app/src/main/res/drawable-xlarge-xhdpi-v11/star_blue.png

rename from mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/ic_menu_bookmark_add.png
rename to mobile/android/app/src/main/res/drawable-xlarge-xxhdpi-v11/ic_menu_bookmark_add.png

rename from mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/star_blue.png
rename to mobile/android/app/src/main/res/drawable-xlarge-xxhdpi-v11/star_blue.png

rename from mobile/android/base/resources/drawable-xxhdpi-v11/ic_status_logo.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi-v11/ic_status_logo.png

rename from mobile/android/base/resources/drawable-xxhdpi/ab_mic.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ab_mic.png

rename from mobile/android/base/resources/drawable-xxhdpi/ab_qrcode.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ab_qrcode.png

rename from mobile/android/base/resources/drawable-xxhdpi/add_folder.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/add_folder.png

rename from mobile/android/base/resources/drawable-xxhdpi/arrow.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/arrow.png

rename from mobile/android/base/resources/drawable-xxhdpi/arrow_up.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/arrow_up.png

rename from mobile/android/base/resources/drawable-xxhdpi/close_edit_mode_dark.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/close_edit_mode_dark.png

rename from mobile/android/base/resources/drawable-xxhdpi/close_edit_mode_light.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/close_edit_mode_light.png

rename from mobile/android/base/resources/drawable-xxhdpi/device_desktop.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/device_desktop.png

rename from mobile/android/base/resources/drawable-xxhdpi/device_mobile.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/device_mobile.png

rename from mobile/android/base/resources/drawable-xxhdpi/dropshadow.9.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/dropshadow.9.png

rename from mobile/android/base/resources/drawable-xxhdpi/exit_fullscreen.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/exit_fullscreen.png

rename from mobile/android/base/resources/drawable-xxhdpi/flat_icon.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/flat_icon.png

rename from mobile/android/base/resources/drawable-xxhdpi/folder_closed.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/folder_closed.png

rename from mobile/android/base/resources/drawable-xxhdpi/foxfinder.webp
rename to mobile/android/app/src/main/res/drawable-xxhdpi/foxfinder.webp

rename from mobile/android/base/resources/drawable-xxhdpi/fullscreen.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/fullscreen.png

rename from mobile/android/base/resources/drawable-xxhdpi/globe_light.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/globe_light.png

rename from mobile/android/base/resources/drawable-xxhdpi/helper_readerview_bookmark.webp
rename to mobile/android/app/src/main/res/drawable-xxhdpi/helper_readerview_bookmark.webp

rename from mobile/android/base/resources/drawable-xxhdpi/home_group_collapsed.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/home_group_collapsed.png

rename from mobile/android/base/resources/drawable-xxhdpi/homepage_banner_firstrun.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/homepage_banner_firstrun.png

rename from mobile/android/base/resources/drawable-xxhdpi/ic_action_settings.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_action_settings.png

rename from mobile/android/base/resources/drawable-xxhdpi/ic_media_pause.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_media_pause.png

rename from mobile/android/base/resources/drawable-xxhdpi/ic_media_play.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_media_play.png

rename from mobile/android/base/resources/drawable-xxhdpi/ic_menu_share.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_menu_share.png

rename from mobile/android/base/resources/drawable-xxhdpi/ic_widget_new_tab.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_widget_new_tab.png

rename from mobile/android/base/resources/drawable-xxhdpi/ic_widget_search.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/ic_widget_search.png

rename from mobile/android/base/resources/drawable-xxhdpi/icon_key.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/icon_key.png

rename from mobile/android/base/resources/drawable-xxhdpi/icon_search_empty_firefox.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/icon_search_empty_firefox.png

rename from mobile/android/base/resources/drawable-xxhdpi/icon_shareplane.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/icon_shareplane.png

rename from mobile/android/base/resources/drawable-xxhdpi/img_check.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/img_check.png

rename from mobile/android/base/resources/drawable-xxhdpi/location.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/location.png

rename from mobile/android/base/resources/drawable-xxhdpi/lock_disabled.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/lock_disabled.png

rename from mobile/android/base/resources/drawable-xxhdpi/lock_inactive.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/lock_inactive.png

rename from mobile/android/base/resources/drawable-xxhdpi/lock_secure.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/lock_secure.png

rename from mobile/android/base/resources/drawable-xxhdpi/menu.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/menu.png

rename from mobile/android/base/resources/drawable-xxhdpi/menu_item_check.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/menu_item_check.png

rename from mobile/android/base/resources/drawable-xxhdpi/menu_item_uncheck.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/menu_item_uncheck.png

rename from mobile/android/base/resources/drawable-xxhdpi/network_error.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/network_error.png

rename from mobile/android/base/resources/drawable-xxhdpi/notification_media.webp
rename to mobile/android/app/src/main/res/drawable-xxhdpi/notification_media.webp

rename from mobile/android/base/resources/drawable-xxhdpi/orange_check.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/orange_check.png

rename from mobile/android/base/resources/drawable-xxhdpi/overlay_bookmark_icon.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/overlay_bookmark_icon.png

rename from mobile/android/base/resources/drawable-xxhdpi/overlay_bookmarked_already_icon.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/overlay_bookmarked_already_icon.png

rename from mobile/android/base/resources/drawable-xxhdpi/overlay_check.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/overlay_check.png

rename from mobile/android/base/resources/drawable-xxhdpi/private_masq.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/private_masq.png

rename from mobile/android/base/resources/drawable-xxhdpi/push_notification.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/push_notification.png

rename from mobile/android/base/resources/drawable-xxhdpi/reading_list_folder.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/reading_list_folder.png

rename from mobile/android/base/resources/drawable-xxhdpi/search_clear.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/search_clear.png

rename from mobile/android/base/resources/drawable-xxhdpi/search_history.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/search_history.png

rename from mobile/android/base/resources/drawable-xxhdpi/search_icon_active.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/search_icon_active.png

rename from mobile/android/base/resources/drawable-xxhdpi/search_icon_inactive.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/search_icon_inactive.png

rename from mobile/android/base/resources/drawable-xxhdpi/search_launcher.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/search_launcher.png

rename from mobile/android/base/resources/drawable-xxhdpi/search_plus.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/search_plus.png

rename from mobile/android/base/resources/drawable-xxhdpi/shareplane.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/shareplane.png

rename from mobile/android/base/resources/drawable-xxhdpi/shield_disabled.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/shield_disabled.png

rename from mobile/android/base/resources/drawable-xxhdpi/shield_enabled.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/shield_enabled.png

rename from mobile/android/base/resources/drawable-xxhdpi/status_icon_readercache.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/status_icon_readercache.png

rename from mobile/android/base/resources/drawable-xxhdpi/suggestedsites_amazon.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_amazon.png

rename from mobile/android/base/resources/drawable-xxhdpi/suggestedsites_facebook.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_facebook.png

rename from mobile/android/base/resources/drawable-xxhdpi/suggestedsites_twitter.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_twitter.png

rename from mobile/android/base/resources/drawable-xxhdpi/suggestedsites_wikipedia.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_wikipedia.png

rename from mobile/android/base/resources/drawable-xxhdpi/suggestedsites_youtube.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_youtube.png

rename from mobile/android/base/resources/drawable-xxhdpi/tab_close.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/tab_close.png

rename from mobile/android/base/resources/drawable-xxhdpi/tab_close_active.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/tab_close_active.png

rename from mobile/android/base/resources/drawable-xxhdpi/tab_new.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/tab_new.png

rename from mobile/android/base/resources/drawable-xxhdpi/tab_preview_masq.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/tab_preview_masq.png

rename from mobile/android/base/resources/drawable-xxhdpi/tabs_panel_nav_back.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/tabs_panel_nav_back.png

rename from mobile/android/base/resources/drawable-xxhdpi/tracking_protection_toolbar_illustration.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/tracking_protection_toolbar_illustration.png

rename from mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_default.9.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/url_bar_entry_default.9.png

rename from mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_default_pb.9.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/url_bar_entry_default_pb.9.png

rename from mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed.9.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/url_bar_entry_pressed.9.png

rename from mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed_pb.9.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/url_bar_entry_pressed_pb.9.png

rename from mobile/android/base/resources/drawable-xxhdpi/urlbar_stop.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/urlbar_stop.png

rename from mobile/android/base/resources/drawable-xxhdpi/warning_major.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/warning_major.png

rename from mobile/android/base/resources/drawable-xxhdpi/warning_minor.png
rename to mobile/android/app/src/main/res/drawable-xxhdpi/warning_minor.png

rename from mobile/android/base/resources/drawable-xxxhdpi/search_launcher.png
rename to mobile/android/app/src/main/res/drawable-xxxhdpi/search_launcher.png

rename from mobile/android/base/resources/drawable/action_bar_button.xml
rename to mobile/android/app/src/main/res/drawable/action_bar_button.xml

rename from mobile/android/base/resources/drawable/action_bar_button_inverse.xml
rename to mobile/android/app/src/main/res/drawable/action_bar_button_inverse.xml

rename from mobile/android/base/resources/drawable/action_bar_button_negative.xml
rename to mobile/android/app/src/main/res/drawable/action_bar_button_negative.xml

rename from mobile/android/base/resources/drawable/action_bar_button_positive.xml
rename to mobile/android/app/src/main/res/drawable/action_bar_button_positive.xml

rename from mobile/android/base/resources/drawable/alert_download_animation.xml
rename to mobile/android/app/src/main/res/drawable/alert_download_animation.xml

rename from mobile/android/base/resources/drawable/arrow_down.xml
rename to mobile/android/app/src/main/res/drawable/arrow_down.xml

rename from mobile/android/base/resources/drawable/as_bin.xml
rename to mobile/android/app/src/main/res/drawable/as_bin.xml

rename from mobile/android/base/resources/drawable/as_bookmark.xml
rename to mobile/android/app/src/main/res/drawable/as_bookmark.xml

rename from mobile/android/base/resources/drawable/as_bookmark_filled.xml
rename to mobile/android/app/src/main/res/drawable/as_bookmark_filled.xml

rename from mobile/android/base/resources/drawable/as_contextmenu_divider.xml
rename to mobile/android/app/src/main/res/drawable/as_contextmenu_divider.xml

rename from mobile/android/base/resources/drawable/as_copy.xml
rename to mobile/android/app/src/main/res/drawable/as_copy.xml

rename from mobile/android/base/resources/drawable/as_dismiss.xml
rename to mobile/android/app/src/main/res/drawable/as_dismiss.xml

rename from mobile/android/base/resources/drawable/as_home.xml
rename to mobile/android/app/src/main/res/drawable/as_home.xml

rename from mobile/android/base/resources/drawable/as_pin.xml
rename to mobile/android/app/src/main/res/drawable/as_pin.xml

rename from mobile/android/base/resources/drawable/as_private.xml
rename to mobile/android/app/src/main/res/drawable/as_private.xml

rename from mobile/android/base/resources/drawable/as_share.xml
rename to mobile/android/app/src/main/res/drawable/as_share.xml

rename from mobile/android/base/resources/drawable/as_tab.xml
rename to mobile/android/app/src/main/res/drawable/as_tab.xml

rename from mobile/android/base/resources/drawable/autocomplete_list_bg.xml
rename to mobile/android/app/src/main/res/drawable/autocomplete_list_bg.xml

rename from mobile/android/base/resources/drawable/bookmark_folder_arrow_up.xml
rename to mobile/android/app/src/main/res/drawable/bookmark_folder_arrow_up.xml

rename from mobile/android/base/resources/drawable/button_background_action_blue_round.xml
rename to mobile/android/app/src/main/res/drawable/button_background_action_blue_round.xml

rename from mobile/android/base/resources/drawable/button_background_action_orange_round.xml
rename to mobile/android/app/src/main/res/drawable/button_background_action_orange_round.xml

rename from mobile/android/base/resources/drawable/button_enabled_action_blue_round.xml
rename to mobile/android/app/src/main/res/drawable/button_enabled_action_blue_round.xml

rename from mobile/android/base/resources/drawable/button_enabled_action_orange_round.xml
rename to mobile/android/app/src/main/res/drawable/button_enabled_action_orange_round.xml

rename from mobile/android/base/resources/drawable/button_pressed_action_blue_round.xml
rename to mobile/android/app/src/main/res/drawable/button_pressed_action_blue_round.xml

rename from mobile/android/base/resources/drawable/button_pressed_action_orange_round.xml
rename to mobile/android/app/src/main/res/drawable/button_pressed_action_orange_round.xml

rename from mobile/android/base/resources/drawable/close_edit_mode_selector.xml
rename to mobile/android/app/src/main/res/drawable/close_edit_mode_selector.xml

rename from mobile/android/base/resources/drawable/color_picker_checkmark.xml
rename to mobile/android/app/src/main/res/drawable/color_picker_checkmark.xml

rename from mobile/android/base/resources/drawable/customtabs_menu_item_control.xml
rename to mobile/android/app/src/main/res/drawable/customtabs_menu_item_control.xml

rename from mobile/android/base/resources/drawable/divider_vertical.xml
rename to mobile/android/app/src/main/res/drawable/divider_vertical.xml

rename from mobile/android/base/resources/drawable/edit_text_default.xml
rename to mobile/android/app/src/main/res/drawable/edit_text_default.xml

rename from mobile/android/base/resources/drawable/edit_text_focused.xml
rename to mobile/android/app/src/main/res/drawable/edit_text_focused.xml

rename from mobile/android/base/resources/drawable/facet_button_background.xml
rename to mobile/android/app/src/main/res/drawable/facet_button_background.xml

rename from mobile/android/base/resources/drawable/facet_button_background_default.xml
rename to mobile/android/app/src/main/res/drawable/facet_button_background_default.xml

rename from mobile/android/base/resources/drawable/facet_button_background_pressed.xml
rename to mobile/android/app/src/main/res/drawable/facet_button_background_pressed.xml

rename from mobile/android/base/resources/drawable/home_banner.xml
rename to mobile/android/app/src/main/res/drawable/home_banner.xml

rename from mobile/android/base/resources/drawable/home_history_clear_button_bg.xml
rename to mobile/android/app/src/main/res/drawable/home_history_clear_button_bg.xml

rename from mobile/android/base/resources/drawable/home_pager_empty_state.xml
rename to mobile/android/app/src/main/res/drawable/home_pager_empty_state.xml

rename from mobile/android/base/resources/drawable/ic_as_bookmarked.xml
rename to mobile/android/app/src/main/res/drawable/ic_as_bookmarked.xml

rename from mobile/android/base/resources/drawable/ic_as_visited.xml
rename to mobile/android/app/src/main/res/drawable/ic_as_visited.xml

rename from mobile/android/base/resources/drawable/icon_grid_item_bg.xml
rename to mobile/android/app/src/main/res/drawable/icon_grid_item_bg.xml

rename from mobile/android/base/resources/drawable/logo.xml
rename to mobile/android/app/src/main/res/drawable/logo.xml

rename from mobile/android/base/resources/drawable/menu_item_action_bar_bg.xml
rename to mobile/android/app/src/main/res/drawable/menu_item_action_bar_bg.xml

rename from mobile/android/base/resources/drawable/menu_item_state.xml
rename to mobile/android/app/src/main/res/drawable/menu_item_state.xml

rename from mobile/android/base/resources/drawable/overlay_share_bookmark_button.xml
rename to mobile/android/app/src/main/res/drawable/overlay_share_bookmark_button.xml

rename from mobile/android/base/resources/drawable/overlay_share_button_background.xml
rename to mobile/android/app/src/main/res/drawable/overlay_share_button_background.xml

rename from mobile/android/base/resources/drawable/overlay_share_button_background_first.xml
rename to mobile/android/app/src/main/res/drawable/overlay_share_button_background_first.xml

rename from mobile/android/base/resources/drawable/panel_auth_button.xml
rename to mobile/android/app/src/main/res/drawable/panel_auth_button.xml

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

rename from mobile/android/base/resources/drawable/push_notification.png
rename to mobile/android/app/src/main/res/drawable/push_notification.png

rename from mobile/android/base/resources/drawable/remote_tabs_setup_button_background.xml
rename to mobile/android/app/src/main/res/drawable/remote_tabs_setup_button_background.xml

rename from mobile/android/base/resources/drawable/search_row_background.xml
rename to mobile/android/app/src/main/res/drawable/search_row_background.xml

rename from mobile/android/base/resources/drawable/search_suggestion_button.xml
rename to mobile/android/app/src/main/res/drawable/search_suggestion_button.xml

rename from mobile/android/base/resources/drawable/search_suggestion_prompt_no.xml
rename to mobile/android/app/src/main/res/drawable/search_suggestion_prompt_no.xml

rename from mobile/android/base/resources/drawable/search_suggestion_prompt_yes.xml
rename to mobile/android/app/src/main/res/drawable/search_suggestion_prompt_yes.xml

rename from mobile/android/base/resources/drawable/shaped_button.xml
rename to mobile/android/app/src/main/res/drawable/shaped_button.xml

rename from mobile/android/base/resources/drawable/site_security_icon.xml
rename to mobile/android/app/src/main/res/drawable/site_security_icon.xml

rename from mobile/android/base/resources/drawable/site_security_unknown.xml
rename to mobile/android/app/src/main/res/drawable/site_security_unknown.xml

rename from mobile/android/base/resources/drawable/tab_history_bg.xml
rename to mobile/android/app/src/main/res/drawable/tab_history_bg.xml

rename from mobile/android/base/resources/drawable/tab_history_icon_state.xml
rename to mobile/android/app/src/main/res/drawable/tab_history_icon_state.xml

rename from mobile/android/base/resources/drawable/tab_item_close_button.xml
rename to mobile/android/app/src/main/res/drawable/tab_item_close_button.xml

rename from mobile/android/base/resources/drawable/tab_panel_tab_background.xml
rename to mobile/android/app/src/main/res/drawable/tab_panel_tab_background.xml

rename from mobile/android/base/resources/drawable/tab_queue_dismiss_button_foreground.xml
rename to mobile/android/app/src/main/res/drawable/tab_queue_dismiss_button_foreground.xml

rename from mobile/android/base/resources/drawable/tab_row.xml
rename to mobile/android/app/src/main/res/drawable/tab_row.xml

rename from mobile/android/base/resources/drawable/tab_strip_button.xml
rename to mobile/android/app/src/main/res/drawable/tab_strip_button.xml

rename from mobile/android/base/resources/drawable/tab_thumbnail.xml
rename to mobile/android/app/src/main/res/drawable/tab_thumbnail.xml

rename from mobile/android/base/resources/drawable/tabs_panel_indicator.xml
rename to mobile/android/app/src/main/res/drawable/tabs_panel_indicator.xml

rename from mobile/android/base/resources/drawable/tabs_panel_indicator_selected.xml
rename to mobile/android/app/src/main/res/drawable/tabs_panel_indicator_selected.xml

rename from mobile/android/base/resources/drawable/tabs_panel_indicator_selected_private.xml
rename to mobile/android/app/src/main/res/drawable/tabs_panel_indicator_selected_private.xml

rename from mobile/android/base/resources/drawable/tabs_strip_indicator.xml
rename to mobile/android/app/src/main/res/drawable/tabs_strip_indicator.xml

rename from mobile/android/base/resources/drawable/toast_background.xml
rename to mobile/android/app/src/main/res/drawable/toast_background.xml

rename from mobile/android/base/resources/drawable/toast_button_background.xml
rename to mobile/android/app/src/main/res/drawable/toast_button_background.xml

rename from mobile/android/base/resources/drawable/toolbar_favicon_default.xml
rename to mobile/android/app/src/main/res/drawable/toolbar_favicon_default.xml

rename from mobile/android/base/resources/drawable/top_sites_thumbnail_bg.xml
rename to mobile/android/app/src/main/res/drawable/top_sites_thumbnail_bg.xml

rename from mobile/android/base/resources/drawable/url_bar_bg.xml
rename to mobile/android/app/src/main/res/drawable/url_bar_bg.xml

rename from mobile/android/base/resources/drawable/url_bar_entry.xml
rename to mobile/android/app/src/main/res/drawable/url_bar_entry.xml

rename from mobile/android/base/resources/drawable/url_bar_nav_button.xml
rename to mobile/android/app/src/main/res/drawable/url_bar_nav_button.xml

rename from mobile/android/base/resources/drawable/url_bar_translating_edge.xml
rename to mobile/android/app/src/main/res/drawable/url_bar_translating_edge.xml

rename from mobile/android/base/resources/drawable/widget_button_left.xml
rename to mobile/android/app/src/main/res/drawable/widget_button_left.xml

rename from mobile/android/base/resources/drawable/widget_button_left_default.xml
rename to mobile/android/app/src/main/res/drawable/widget_button_left_default.xml

rename from mobile/android/base/resources/drawable/widget_button_left_pressed.xml
rename to mobile/android/app/src/main/res/drawable/widget_button_left_pressed.xml

rename from mobile/android/base/resources/drawable/widget_button_middle.xml
rename to mobile/android/app/src/main/res/drawable/widget_button_middle.xml

rename from mobile/android/base/resources/drawable/widget_button_middle_pressed.xml
rename to mobile/android/app/src/main/res/drawable/widget_button_middle_pressed.xml

rename from mobile/android/base/resources/drawable/widget_button_right.xml
rename to mobile/android/app/src/main/res/drawable/widget_button_right.xml

rename from mobile/android/base/resources/drawable/widget_button_right_pressed.xml
rename to mobile/android/app/src/main/res/drawable/widget_button_right_pressed.xml

rename from mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
rename to mobile/android/app/src/main/res/layout-large-v11/browser_toolbar.xml

rename from mobile/android/base/resources/layout-large-v11/tabs_counter.xml
rename to mobile/android/app/src/main/res/layout-large-v11/tabs_counter.xml

rename from mobile/android/base/resources/layout/actionbar.xml
rename to mobile/android/app/src/main/res/layout/actionbar.xml

rename from mobile/android/base/resources/layout/activity_stream.xml
rename to mobile/android/app/src/main/res/layout/activity_stream.xml

rename from mobile/android/base/resources/layout/activity_stream_card_history_item.xml
rename to mobile/android/app/src/main/res/layout/activity_stream_card_history_item.xml

rename from mobile/android/base/resources/layout/activity_stream_contextmenu_bottomsheet.xml
rename to mobile/android/app/src/main/res/layout/activity_stream_contextmenu_bottomsheet.xml

rename from mobile/android/base/resources/layout/activity_stream_contextmenu_popupmenu.xml
rename to mobile/android/app/src/main/res/layout/activity_stream_contextmenu_popupmenu.xml

rename from mobile/android/base/resources/layout/activity_stream_main_highlightstitle.xml
rename to mobile/android/app/src/main/res/layout/activity_stream_main_highlightstitle.xml

rename from mobile/android/base/resources/layout/activity_stream_main_toppanel.xml
rename to mobile/android/app/src/main/res/layout/activity_stream_main_toppanel.xml

rename from mobile/android/base/resources/layout/activity_stream_main_welcomepanel.xml
rename to mobile/android/app/src/main/res/layout/activity_stream_main_welcomepanel.xml

rename from mobile/android/base/resources/layout/activity_stream_main_welcomepanel_content.xml
rename to mobile/android/app/src/main/res/layout/activity_stream_main_welcomepanel_content.xml

rename from mobile/android/base/resources/layout/activity_stream_topsites_card.xml
rename to mobile/android/app/src/main/res/layout/activity_stream_topsites_card.xml

rename from mobile/android/base/resources/layout/activity_stream_topsites_page.xml
rename to mobile/android/app/src/main/res/layout/activity_stream_topsites_page.xml

rename from mobile/android/base/resources/layout/anchored_popup.xml
rename to mobile/android/app/src/main/res/layout/anchored_popup.xml

rename from mobile/android/base/resources/layout/as_content.xml
rename to mobile/android/app/src/main/res/layout/as_content.xml

rename from mobile/android/base/resources/layout/autocomplete_list.xml
rename to mobile/android/app/src/main/res/layout/autocomplete_list.xml

rename from mobile/android/base/resources/layout/autocomplete_list_item.xml
rename to mobile/android/app/src/main/res/layout/autocomplete_list_item.xml

rename from mobile/android/base/resources/layout/basic_color_picker_dialog.xml
rename to mobile/android/app/src/main/res/layout/basic_color_picker_dialog.xml

rename from mobile/android/base/resources/layout/bookmark_add_folder.xml
rename to mobile/android/app/src/main/res/layout/bookmark_add_folder.xml

rename from mobile/android/base/resources/layout/bookmark_edit.xml
rename to mobile/android/app/src/main/res/layout/bookmark_edit.xml

rename from mobile/android/base/resources/layout/bookmark_edit_with_full_page.xml
rename to mobile/android/app/src/main/res/layout/bookmark_edit_with_full_page.xml

rename from mobile/android/base/resources/layout/bookmark_folder_item.xml
rename to mobile/android/app/src/main/res/layout/bookmark_folder_item.xml

rename from mobile/android/base/resources/layout/bookmark_folder_row.xml
rename to mobile/android/app/src/main/res/layout/bookmark_folder_row.xml

rename from mobile/android/base/resources/layout/bookmark_folder_select.xml
rename to mobile/android/app/src/main/res/layout/bookmark_folder_select.xml

rename from mobile/android/base/resources/layout/bookmark_item_row.xml
rename to mobile/android/app/src/main/res/layout/bookmark_item_row.xml

rename from mobile/android/base/resources/layout/bookmark_screenshot_row.xml
rename to mobile/android/app/src/main/res/layout/bookmark_screenshot_row.xml

rename from mobile/android/base/resources/layout/browser_search.xml
rename to mobile/android/app/src/main/res/layout/browser_search.xml

rename from mobile/android/base/resources/layout/browser_toolbar.xml
rename to mobile/android/app/src/main/res/layout/browser_toolbar.xml

rename from mobile/android/base/resources/layout/button_toast.xml
rename to mobile/android/app/src/main/res/layout/button_toast.xml

rename from mobile/android/base/resources/layout/color_picker_row.xml
rename to mobile/android/app/src/main/res/layout/color_picker_row.xml

rename from mobile/android/base/resources/layout/customtabs_action_bar_custom_view.xml
rename to mobile/android/app/src/main/res/layout/customtabs_action_bar_custom_view.xml

rename from mobile/android/base/resources/layout/customtabs_activity.xml
rename to mobile/android/app/src/main/res/layout/customtabs_activity.xml

rename from mobile/android/base/resources/layout/customtabs_options_menu_footer.xml
rename to mobile/android/app/src/main/res/layout/customtabs_options_menu_footer.xml

rename from mobile/android/base/resources/layout/datetime_picker.xml
rename to mobile/android/app/src/main/res/layout/datetime_picker.xml

rename from mobile/android/base/resources/layout/default_doorhanger.xml
rename to mobile/android/app/src/main/res/layout/default_doorhanger.xml

rename from mobile/android/base/resources/layout/doorhanger.xml
rename to mobile/android/app/src/main/res/layout/doorhanger.xml

rename from mobile/android/base/resources/layout/doorhanger_security.xml
rename to mobile/android/app/src/main/res/layout/doorhanger_security.xml

rename from mobile/android/base/resources/layout/find_in_page_content.xml
rename to mobile/android/app/src/main/res/layout/find_in_page_content.xml

rename from mobile/android/base/resources/layout/firstrun_animation_container.xml
rename to mobile/android/app/src/main/res/layout/firstrun_animation_container.xml

rename from mobile/android/base/resources/layout/firstrun_basepanel_checkable_fragment.xml
rename to mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml

rename from mobile/android/base/resources/layout/firstrun_sync_fragment.xml
rename to mobile/android/app/src/main/res/layout/firstrun_sync_fragment.xml

rename from mobile/android/base/resources/layout/gecko_app.xml
rename to mobile/android/app/src/main/res/layout/gecko_app.xml

rename from mobile/android/base/resources/layout/history_sync_setup.xml
rename to mobile/android/app/src/main/res/layout/history_sync_setup.xml

rename from mobile/android/base/resources/layout/home_banner.xml
rename to mobile/android/app/src/main/res/layout/home_banner.xml

rename from mobile/android/base/resources/layout/home_banner_content.xml
rename to mobile/android/app/src/main/res/layout/home_banner_content.xml

rename from mobile/android/base/resources/layout/home_bookmarks_panel.xml
rename to mobile/android/app/src/main/res/layout/home_bookmarks_panel.xml

rename from mobile/android/base/resources/layout/home_combined_back_item.xml
rename to mobile/android/app/src/main/res/layout/home_combined_back_item.xml

rename from mobile/android/base/resources/layout/home_combined_history_panel.xml
rename to mobile/android/app/src/main/res/layout/home_combined_history_panel.xml

rename from mobile/android/base/resources/layout/home_empty_panel.xml
rename to mobile/android/app/src/main/res/layout/home_empty_panel.xml

rename from mobile/android/base/resources/layout/home_header_row.xml
rename to mobile/android/app/src/main/res/layout/home_header_row.xml

rename from mobile/android/base/resources/layout/home_item_row.xml
rename to mobile/android/app/src/main/res/layout/home_item_row.xml

rename from mobile/android/base/resources/layout/home_pager.xml
rename to mobile/android/app/src/main/res/layout/home_pager.xml

rename from mobile/android/base/resources/layout/home_remote_tabs_group.xml
rename to mobile/android/app/src/main/res/layout/home_remote_tabs_group.xml

rename from mobile/android/base/resources/layout/home_remote_tabs_hidden_devices.xml
rename to mobile/android/app/src/main/res/layout/home_remote_tabs_hidden_devices.xml

rename from mobile/android/base/resources/layout/home_search_item_row.xml
rename to mobile/android/app/src/main/res/layout/home_search_item_row.xml

rename from mobile/android/base/resources/layout/home_smartfolder.xml
rename to mobile/android/app/src/main/res/layout/home_smartfolder.xml

rename from mobile/android/base/resources/layout/home_suggestion_prompt.xml
rename to mobile/android/app/src/main/res/layout/home_suggestion_prompt.xml

rename from mobile/android/base/resources/layout/home_top_sites_panel.xml
rename to mobile/android/app/src/main/res/layout/home_top_sites_panel.xml

rename from mobile/android/base/resources/layout/icon_grid.xml
rename to mobile/android/app/src/main/res/layout/icon_grid.xml

rename from mobile/android/base/resources/layout/icon_grid_item.xml
rename to mobile/android/app/src/main/res/layout/icon_grid_item.xml

rename from mobile/android/base/resources/layout/list_item_header.xml
rename to mobile/android/app/src/main/res/layout/list_item_header.xml

rename from mobile/android/base/resources/layout/login_doorhanger.xml
rename to mobile/android/app/src/main/res/layout/login_doorhanger.xml

rename from mobile/android/base/resources/layout/login_edit_dialog.xml
rename to mobile/android/app/src/main/res/layout/login_edit_dialog.xml

rename from mobile/android/base/resources/layout/media_casting.xml
rename to mobile/android/app/src/main/res/layout/media_casting.xml

rename from mobile/android/base/resources/layout/menu_action_bar.xml
rename to mobile/android/app/src/main/res/layout/menu_action_bar.xml

rename from mobile/android/base/resources/layout/menu_item_switcher_layout.xml
rename to mobile/android/app/src/main/res/layout/menu_item_switcher_layout.xml

rename from mobile/android/base/resources/layout/menu_popup.xml
rename to mobile/android/app/src/main/res/layout/menu_popup.xml

rename from mobile/android/base/resources/layout/menu_secondary_action_bar.xml
rename to mobile/android/app/src/main/res/layout/menu_secondary_action_bar.xml

rename from mobile/android/base/resources/layout/overlay_share_button.xml
rename to mobile/android/app/src/main/res/layout/overlay_share_button.xml

rename from mobile/android/base/resources/layout/overlay_share_dialog.xml
rename to mobile/android/app/src/main/res/layout/overlay_share_dialog.xml

rename from mobile/android/base/resources/layout/overlay_share_send_tab_item.xml
rename to mobile/android/app/src/main/res/layout/overlay_share_send_tab_item.xml

rename from mobile/android/base/resources/layout/panel_article_item.xml
rename to mobile/android/app/src/main/res/layout/panel_article_item.xml

rename from mobile/android/base/resources/layout/panel_auth_layout.xml
rename to mobile/android/app/src/main/res/layout/panel_auth_layout.xml

rename from mobile/android/base/resources/layout/panel_back_item.xml
rename to mobile/android/app/src/main/res/layout/panel_back_item.xml

rename from mobile/android/base/resources/layout/panel_icon_item.xml
rename to mobile/android/app/src/main/res/layout/panel_icon_item.xml

rename from mobile/android/base/resources/layout/panel_image_item.xml
rename to mobile/android/app/src/main/res/layout/panel_image_item.xml

rename from mobile/android/base/resources/layout/panel_item_container.xml
rename to mobile/android/app/src/main/res/layout/panel_item_container.xml

rename from mobile/android/base/resources/layout/pin_site_dialog.xml
rename to mobile/android/app/src/main/res/layout/pin_site_dialog.xml

rename from mobile/android/base/resources/layout/preference_checkbox.xml
rename to mobile/android/app/src/main/res/layout/preference_checkbox.xml

rename from mobile/android/base/resources/layout/preference_panels.xml
rename to mobile/android/app/src/main/res/layout/preference_panels.xml

rename from mobile/android/base/resources/layout/preference_rightalign_icon.xml
rename to mobile/android/app/src/main/res/layout/preference_rightalign_icon.xml

rename from mobile/android/base/resources/layout/preference_search_engine.xml
rename to mobile/android/app/src/main/res/layout/preference_search_engine.xml

rename from mobile/android/base/resources/layout/preference_search_tip.xml
rename to mobile/android/app/src/main/res/layout/preference_search_tip.xml

rename from mobile/android/base/resources/layout/preference_set_homepage.xml
rename to mobile/android/app/src/main/res/layout/preference_set_homepage.xml

rename from mobile/android/base/resources/layout/private_tabs_panel.xml
rename to mobile/android/app/src/main/res/layout/private_tabs_panel.xml

rename from mobile/android/base/resources/layout/restricted_firstrun_welcome_fragment.xml
rename to mobile/android/app/src/main/res/layout/restricted_firstrun_welcome_fragment.xml

rename from mobile/android/base/resources/layout/search_activity_main.xml
rename to mobile/android/app/src/main/res/layout/search_activity_main.xml

rename from mobile/android/base/resources/layout/search_bar.xml
rename to mobile/android/app/src/main/res/layout/search_bar.xml

rename from mobile/android/base/resources/layout/search_empty.xml
rename to mobile/android/app/src/main/res/layout/search_empty.xml

rename from mobile/android/base/resources/layout/search_engine_bar_item.xml
rename to mobile/android/app/src/main/res/layout/search_engine_bar_item.xml

rename from mobile/android/base/resources/layout/search_engine_bar_label.xml
rename to mobile/android/app/src/main/res/layout/search_engine_bar_label.xml

rename from mobile/android/base/resources/layout/search_engine_row.xml
rename to mobile/android/app/src/main/res/layout/search_engine_row.xml

rename from mobile/android/base/resources/layout/search_fragment_post_search.xml
rename to mobile/android/app/src/main/res/layout/search_fragment_post_search.xml

rename from mobile/android/base/resources/layout/search_fragment_pre_search.xml
rename to mobile/android/app/src/main/res/layout/search_fragment_pre_search.xml

rename from mobile/android/base/resources/layout/search_history_row.xml
rename to mobile/android/app/src/main/res/layout/search_history_row.xml

rename from mobile/android/base/resources/layout/search_sugestions.xml
rename to mobile/android/app/src/main/res/layout/search_sugestions.xml

rename from mobile/android/base/resources/layout/search_suggestions_row.xml
rename to mobile/android/app/src/main/res/layout/search_suggestions_row.xml

rename from mobile/android/base/resources/layout/search_widget.xml
rename to mobile/android/app/src/main/res/layout/search_widget.xml

rename from mobile/android/base/resources/layout/select_dialog_list.xml
rename to mobile/android/app/src/main/res/layout/select_dialog_list.xml

rename from mobile/android/base/resources/layout/select_dialog_multichoice.xml
rename to mobile/android/app/src/main/res/layout/select_dialog_multichoice.xml

rename from mobile/android/base/resources/layout/select_dialog_singlechoice.xml
rename to mobile/android/app/src/main/res/layout/select_dialog_singlechoice.xml

rename from mobile/android/base/resources/layout/site_identity.xml
rename to mobile/android/app/src/main/res/layout/site_identity.xml

rename from mobile/android/base/resources/layout/site_setting_item.xml
rename to mobile/android/app/src/main/res/layout/site_setting_item.xml

rename from mobile/android/base/resources/layout/suggestion_item.xml
rename to mobile/android/app/src/main/res/layout/suggestion_item.xml

rename from mobile/android/base/resources/layout/tab_history_item_row.xml
rename to mobile/android/app/src/main/res/layout/tab_history_item_row.xml

rename from mobile/android/base/resources/layout/tab_history_layout.xml
rename to mobile/android/app/src/main/res/layout/tab_history_layout.xml

rename from mobile/android/base/resources/layout/tab_menu_strip.xml
rename to mobile/android/app/src/main/res/layout/tab_menu_strip.xml

rename from mobile/android/base/resources/layout/tab_prompt_input.xml
rename to mobile/android/app/src/main/res/layout/tab_prompt_input.xml

rename from mobile/android/base/resources/layout/tab_queue_prompt.xml
rename to mobile/android/app/src/main/res/layout/tab_queue_prompt.xml

rename from mobile/android/base/resources/layout/tab_queue_toast.xml
rename to mobile/android/app/src/main/res/layout/tab_queue_toast.xml

rename from mobile/android/base/resources/layout/tab_strip.xml
rename to mobile/android/app/src/main/res/layout/tab_strip.xml

rename from mobile/android/base/resources/layout/tab_strip_inner.xml
rename to mobile/android/app/src/main/res/layout/tab_strip_inner.xml

rename from mobile/android/base/resources/layout/tab_strip_item.xml
rename to mobile/android/app/src/main/res/layout/tab_strip_item.xml

rename from mobile/android/base/resources/layout/tab_strip_item_view.xml
rename to mobile/android/app/src/main/res/layout/tab_strip_item_view.xml

rename from mobile/android/base/resources/layout/tabs_counter.xml
rename to mobile/android/app/src/main/res/layout/tabs_counter.xml

rename from mobile/android/base/resources/layout/tabs_layout_item_view.xml
rename to mobile/android/app/src/main/res/layout/tabs_layout_item_view.xml

rename from mobile/android/base/resources/layout/tabs_list_item_view.xml
rename to mobile/android/app/src/main/res/layout/tabs_list_item_view.xml

rename from mobile/android/base/resources/layout/tabs_panel_default.xml
rename to mobile/android/app/src/main/res/layout/tabs_panel_default.xml

rename from mobile/android/base/resources/layout/tabs_panel_indicator.xml
rename to mobile/android/app/src/main/res/layout/tabs_panel_indicator.xml

rename from mobile/android/base/resources/layout/tabs_panel_view.xml
rename to mobile/android/app/src/main/res/layout/tabs_panel_view.xml

rename from mobile/android/base/resources/layout/toolbar_display_layout.xml
rename to mobile/android/app/src/main/res/layout/toolbar_display_layout.xml

rename from mobile/android/base/resources/layout/toolbar_edit_layout.xml
rename to mobile/android/app/src/main/res/layout/toolbar_edit_layout.xml

rename from mobile/android/base/resources/layout/top_sites_grid_item_view.xml
rename to mobile/android/app/src/main/res/layout/top_sites_grid_item_view.xml

rename from mobile/android/base/resources/layout/tracking_protection_prompt.xml
rename to mobile/android/app/src/main/res/layout/tracking_protection_prompt.xml

rename from mobile/android/base/resources/layout/two_line_folder_row.xml
rename to mobile/android/app/src/main/res/layout/two_line_folder_row.xml

rename from mobile/android/base/resources/layout/two_line_page_row.xml
rename to mobile/android/app/src/main/res/layout/two_line_page_row.xml

rename from mobile/android/base/resources/layout/validation_message.xml
rename to mobile/android/app/src/main/res/layout/validation_message.xml

rename from mobile/android/base/resources/layout/webapps_action_bar_custom_view.xml
rename to mobile/android/app/src/main/res/layout/webapps_action_bar_custom_view.xml

rename from mobile/android/base/resources/menu-large/browser_app_menu.xml
rename to mobile/android/app/src/main/res/menu-large/browser_app_menu.xml

rename from mobile/android/base/resources/menu-v11/preferences_search_menu.xml
rename to mobile/android/app/src/main/res/menu-v11/preferences_search_menu.xml

rename from mobile/android/base/resources/menu-v11/tabs_menu.xml
rename to mobile/android/app/src/main/res/menu-v11/tabs_menu.xml

rename from mobile/android/base/resources/menu-v11/titlebar_contextmenu.xml
rename to mobile/android/app/src/main/res/menu-v11/titlebar_contextmenu.xml

rename from mobile/android/base/resources/menu-xlarge/browser_app_menu.xml
rename to mobile/android/app/src/main/res/menu-xlarge/browser_app_menu.xml

rename from mobile/android/base/resources/menu/activitystream_contextmenu.xml
rename to mobile/android/app/src/main/res/menu/activitystream_contextmenu.xml

rename from mobile/android/base/resources/menu/bookmark_edit_menu.xml
rename to mobile/android/app/src/main/res/menu/bookmark_edit_menu.xml

rename from mobile/android/base/resources/menu/bookmark_folder_menu.xml
rename to mobile/android/app/src/main/res/menu/bookmark_folder_menu.xml

rename from mobile/android/base/resources/menu/browser_app_menu.xml
rename to mobile/android/app/src/main/res/menu/browser_app_menu.xml

rename from mobile/android/base/resources/menu/browsersearch_contextmenu.xml
rename to mobile/android/app/src/main/res/menu/browsersearch_contextmenu.xml

rename from mobile/android/base/resources/menu/customtabs_menu.xml
rename to mobile/android/app/src/main/res/menu/customtabs_menu.xml

rename from mobile/android/base/resources/menu/gecko_app_menu.xml
rename to mobile/android/app/src/main/res/menu/gecko_app_menu.xml

rename from mobile/android/base/resources/menu/home_contextmenu.xml
rename to mobile/android/app/src/main/res/menu/home_contextmenu.xml

rename from mobile/android/base/resources/menu/home_remote_tabs_client_contextmenu.xml
rename to mobile/android/app/src/main/res/menu/home_remote_tabs_client_contextmenu.xml

rename from mobile/android/base/resources/menu/preferences_search_menu.xml
rename to mobile/android/app/src/main/res/menu/preferences_search_menu.xml

rename from mobile/android/base/resources/menu/tabs_menu.xml
rename to mobile/android/app/src/main/res/menu/tabs_menu.xml

rename from mobile/android/base/resources/menu/titlebar_contextmenu.xml
rename to mobile/android/app/src/main/res/menu/titlebar_contextmenu.xml

rename from mobile/android/base/resources/raw/bookmarkdefaults_favicon_addons.png
rename to mobile/android/app/src/main/res/raw/bookmarkdefaults_favicon_addons.png

rename from mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_support.png
rename to mobile/android/app/src/main/res/raw/bookmarkdefaults_favicon_restricted_support.png

rename from mobile/android/base/resources/raw/bookmarkdefaults_favicon_restricted_webmaker.png
rename to mobile/android/app/src/main/res/raw/bookmarkdefaults_favicon_restricted_webmaker.png

rename from mobile/android/base/resources/raw/bookmarkdefaults_favicon_support.png
rename to mobile/android/app/src/main/res/raw/bookmarkdefaults_favicon_support.png

rename from mobile/android/base/resources/raw/fake_home_items.json
rename to mobile/android/app/src/main/res/raw/fake_home_items.json

rename from mobile/android/base/resources/raw/topdomains.txt
rename to mobile/android/app/src/main/res/raw/topdomains.txt

rename from mobile/android/base/resources/values-land/dimens.xml
rename to mobile/android/app/src/main/res/values-land/dimens.xml

rename from mobile/android/base/resources/values-land/integers.xml
rename to mobile/android/app/src/main/res/values-land/integers.xml

rename from mobile/android/base/resources/values-land/styles.xml
rename to mobile/android/app/src/main/res/values-land/styles.xml

rename from mobile/android/base/resources/values-large-land-v11/dimens.xml
rename to mobile/android/app/src/main/res/values-large-land-v11/dimens.xml

rename from mobile/android/base/resources/values-large-land-v11/styles.xml
rename to mobile/android/app/src/main/res/values-large-land-v11/styles.xml

rename from mobile/android/base/resources/values-large-v16/dimens.xml
rename to mobile/android/app/src/main/res/values-large-v16/dimens.xml

rename from mobile/android/base/resources/values-large-v16/styles.xml
rename to mobile/android/app/src/main/res/values-large-v16/styles.xml

rename from mobile/android/base/resources/values-large-v17/styles.xml
rename to mobile/android/app/src/main/res/values-large-v17/styles.xml

rename from mobile/android/base/resources/values-large/bool.xml
rename to mobile/android/app/src/main/res/values-large/bool.xml

rename from mobile/android/base/resources/values-large/dimens.xml
rename to mobile/android/app/src/main/res/values-large/dimens.xml

rename from mobile/android/base/resources/values-large/integers.xml
rename to mobile/android/app/src/main/res/values-large/integers.xml

rename from mobile/android/base/resources/values-large/styles.xml
rename to mobile/android/app/src/main/res/values-large/styles.xml

rename from mobile/android/base/resources/values-sw240dp/dimens.xml
rename to mobile/android/app/src/main/res/values-sw240dp/dimens.xml

rename from mobile/android/base/resources/values-sw360dp/dimens.xml
rename to mobile/android/app/src/main/res/values-sw360dp/dimens.xml

rename from mobile/android/base/resources/values-sw400dp/dimens.xml
rename to mobile/android/app/src/main/res/values-sw400dp/dimens.xml

rename from mobile/android/base/resources/values-v11/dimens.xml
rename to mobile/android/app/src/main/res/values-v11/dimens.xml

rename from mobile/android/base/resources/values-v11/styles.xml
rename to mobile/android/app/src/main/res/values-v11/styles.xml

rename from mobile/android/base/resources/values-v11/themes.xml
rename to mobile/android/app/src/main/res/values-v11/themes.xml

rename from mobile/android/base/resources/values-v13/search_styles.xml
rename to mobile/android/app/src/main/res/values-v13/search_styles.xml

rename from mobile/android/base/resources/values-v13/styles.xml
rename to mobile/android/app/src/main/res/values-v13/styles.xml

rename from mobile/android/base/resources/values-v14/themes.xml
rename to mobile/android/app/src/main/res/values-v14/themes.xml

rename from mobile/android/base/resources/values-v16/search_styles.xml
rename to mobile/android/app/src/main/res/values-v16/search_styles.xml

rename from mobile/android/base/resources/values-v16/styles.xml
rename to mobile/android/app/src/main/res/values-v16/styles.xml

rename from mobile/android/base/resources/values-v17/styles.xml
rename to mobile/android/app/src/main/res/values-v17/styles.xml

rename from mobile/android/base/resources/values-v19/dimens.xml
rename to mobile/android/app/src/main/res/values-v19/dimens.xml

rename from mobile/android/base/resources/values-v19/styles.xml
rename to mobile/android/app/src/main/res/values-v19/styles.xml

rename from mobile/android/base/resources/values-v21/dimens.xml
rename to mobile/android/app/src/main/res/values-v21/dimens.xml

rename from mobile/android/base/resources/values-v21/integers.xml
rename to mobile/android/app/src/main/res/values-v21/integers.xml

rename from mobile/android/base/resources/values-v21/styles.xml
rename to mobile/android/app/src/main/res/values-v21/styles.xml

rename from mobile/android/base/resources/values-v21/themes.xml
rename to mobile/android/app/src/main/res/values-v21/themes.xml

rename from mobile/android/base/resources/values-w400dp/styles.xml
rename to mobile/android/app/src/main/res/values-w400dp/styles.xml

rename from mobile/android/base/resources/values-xlarge-land-v11/dimens.xml
rename to mobile/android/app/src/main/res/values-xlarge-land-v11/dimens.xml

rename from mobile/android/base/resources/values-xlarge-land-v11/styles.xml
rename to mobile/android/app/src/main/res/values-xlarge-land-v11/styles.xml

rename from mobile/android/base/resources/values-xlarge-v11/dimens.xml
rename to mobile/android/app/src/main/res/values-xlarge-v11/dimens.xml

rename from mobile/android/base/resources/values-xlarge-v11/integers.xml
rename to mobile/android/app/src/main/res/values-xlarge-v11/integers.xml

rename from mobile/android/base/resources/values-xlarge-v11/styles.xml
rename to mobile/android/app/src/main/res/values-xlarge-v11/styles.xml

rename from mobile/android/base/resources/values/arrays.xml
rename to mobile/android/app/src/main/res/values/arrays.xml

rename from mobile/android/base/resources/values/attrs.xml
rename to mobile/android/app/src/main/res/values/attrs.xml

rename from mobile/android/base/resources/values/bool.xml
rename to mobile/android/app/src/main/res/values/bool.xml

rename from mobile/android/base/resources/values/colors.xml
rename to mobile/android/app/src/main/res/values/colors.xml

rename from mobile/android/base/resources/values/dimens.xml
rename to mobile/android/app/src/main/res/values/dimens.xml

rename from mobile/android/base/resources/values/ids.xml
rename to mobile/android/app/src/main/res/values/ids.xml

rename from mobile/android/base/resources/values/integers.xml
rename to mobile/android/app/src/main/res/values/integers.xml

rename from mobile/android/base/resources/values/search_attrs.xml
rename to mobile/android/app/src/main/res/values/search_attrs.xml

rename from mobile/android/base/resources/values/search_colors.xml
rename to mobile/android/app/src/main/res/values/search_colors.xml

rename from mobile/android/base/resources/values/search_dimens.xml
rename to mobile/android/app/src/main/res/values/search_dimens.xml

rename from mobile/android/base/resources/values/search_styles.xml
rename to mobile/android/app/src/main/res/values/search_styles.xml

rename from mobile/android/base/resources/values/styles.xml
rename to mobile/android/app/src/main/res/values/styles.xml

rename from mobile/android/base/resources/values/themes.xml
rename to mobile/android/app/src/main/res/values/themes.xml

rename from mobile/android/base/resources/values/vpi__attrs.xml
rename to mobile/android/app/src/main/res/values/vpi__attrs.xml

rename from mobile/android/base/resources/values/vpi__defaults.xml
rename to mobile/android/app/src/main/res/values/vpi__defaults.xml

rename from mobile/android/base/resources/xml-v11/preference_headers.xml
rename to mobile/android/app/src/main/res/xml-v11/preference_headers.xml

rename from mobile/android/base/resources/xml-v11/preferences_default_browser_tablet.xml
rename to mobile/android/app/src/main/res/xml-v11/preferences_default_browser_tablet.xml

rename from mobile/android/base/resources/xml-v11/preferences_privacy_clear_tablet.xml
rename to mobile/android/app/src/main/res/xml-v11/preferences_privacy_clear_tablet.xml

rename from mobile/android/base/resources/xml-v11/preferences_search.xml
rename to mobile/android/app/src/main/res/xml-v11/preferences_search.xml

rename from mobile/android/base/resources/xml/preference_headers.xml
rename to mobile/android/app/src/main/res/xml/preference_headers.xml

rename from mobile/android/base/resources/xml/preferences.xml
rename to mobile/android/app/src/main/res/xml/preferences.xml

rename from mobile/android/base/resources/xml/preferences_accessibility.xml
rename to mobile/android/app/src/main/res/xml/preferences_accessibility.xml

rename from mobile/android/base/resources/xml/preferences_advanced.xml
rename to mobile/android/app/src/main/res/xml/preferences_advanced.xml

rename from mobile/android/base/resources/xml/preferences_general.xml
rename to mobile/android/app/src/main/res/xml/preferences_general.xml

rename from mobile/android/base/resources/xml/preferences_general_tablet.xml
rename to mobile/android/app/src/main/res/xml/preferences_general_tablet.xml

rename from mobile/android/base/resources/xml/preferences_home.xml
rename to mobile/android/app/src/main/res/xml/preferences_home.xml

rename from mobile/android/base/resources/xml/preferences_locale.xml
rename to mobile/android/app/src/main/res/xml/preferences_locale.xml

rename from mobile/android/base/resources/xml/preferences_notifications.xml
rename to mobile/android/app/src/main/res/xml/preferences_notifications.xml

rename from mobile/android/base/resources/xml/preferences_privacy.xml
rename to mobile/android/app/src/main/res/xml/preferences_privacy.xml

rename from mobile/android/base/resources/xml/preferences_search.xml
rename to mobile/android/app/src/main/res/xml/preferences_search.xml

rename from mobile/android/base/resources/xml/preferences_vendor.xml
rename to mobile/android/app/src/main/res/xml/preferences_vendor.xml

rename from mobile/android/base/resources/xml/search_preferences.xml
rename to mobile/android/app/src/main/res/xml/search_preferences.xml

rename from mobile/android/base/resources/xml/search_widget_info.xml
rename to mobile/android/app/src/main/res/xml/search_widget_info.xml

rename from mobile/android/base/resources/xml/searchable.xml
rename to mobile/android/app/src/main/res/xml/searchable.xml

author	jwu <jwu@mozilla.com>
	Sat, 17 Jun 2017 01:17:28 +0800
changeset 596672	8f10e2a7a8d58a7d295eefb92cc9aaf71be9834f
parent 596660	72346a4d6afcc17504f911190dbf470100e879ec
child 596673	b580f64a10426e4fdabb5ced66fa702fbac6490e
push id	64713
push user	bmo:topwu.tw@gmail.com
push date	Mon, 19 Jun 2017 15:55:59 +0000
reviewers	nalexander, maliu, nechen, walkingice
bugs	1372486
milestone	56.0a1