--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -152,17 +152,16 @@ FENNEC_JAVA_FILES = \
   TabsPanel.java \
   TabsTray.java \
   TabsAccessor.java \
   Telemetry.java \
   TextSelection.java \
   TextSelectionHandle.java \
   ThumbnailHelper.java \
   TouchEventInterceptor.java \
-  UpdateServiceHelper.java \
   VideoPlayer.java \
   WebAppAllocator.java \
   WebAppImpl.java \
   ZoomConstraints.java \
   braille/com/googlecode/eyesfree/braille/selfbraille/ISelfBrailleService.java \
   braille/com/googlecode/eyesfree/braille/selfbraille/SelfBrailleClient.java \
   braille/com/googlecode/eyesfree/braille/selfbraille/WriteData.java \
   db/BrowserContract.java \
@@ -248,31 +247,32 @@ FENNEC_JAVA_FILES = \
   menu/GeckoSubMenu.java \
   menu/MenuItemActionBar.java \
   menu/MenuItemActionView.java \
   menu/MenuItemDefault.java \
   menu/MenuPanel.java \
   menu/MenuPopup.java \
   preferences/SearchPreferenceCategory.java \
   preferences/SearchEnginePreference.java \
+  updater/UpdateServiceHelper.java \
+  updater/UpdateService.java \
   widget/ActivityChooserModel.java \
   widget/ButtonToast.java \
   widget/ArrowPopup.java \
   widget/DateTimePicker.java \
   widget/Divider.java \
   widget/FaviconView.java \
   widget/GeckoPopupMenu.java \
   widget/GeckoActionProvider.java \
   widget/IconTabWidget.java \
   widget/TabRow.java \
   widget/ThumbnailView.java \
   widget/TwoWayView.java \
   GeckoNetworkManager.java \
   GeckoScreenOrientationListener.java \
-  UpdateService.java \
   GeckoUpdateReceiver.java \
   ReferrerReceiver.java \
   $(NULL)
 
 WEBSOCKETS_JAVA_FILES := \
   websockets/HybiParser.java \
   websockets/WebSocketClient.java \
   $(NULL)

rename from mobile/android/base/UpdateService.java
rename to mobile/android/base/updater/UpdateService.java

rename from mobile/android/base/UpdateServiceHelper.java
rename to mobile/android/base/updater/UpdateServiceHelper.java