diff --git a/product/modules/agents/android/client/AndroidManifest.xml b/product/modules/mobileservices/agents/android/client/AndroidManifest.xml similarity index 100% rename from product/modules/agents/android/client/AndroidManifest.xml rename to product/modules/mobileservices/agents/android/client/AndroidManifest.xml diff --git a/product/modules/agents/android/client/README.md b/product/modules/mobileservices/agents/android/client/README.md similarity index 100% rename from product/modules/agents/android/client/README.md rename to product/modules/mobileservices/agents/android/client/README.md diff --git a/product/modules/agents/android/client/assets/config.properties b/product/modules/mobileservices/agents/android/client/assets/config.properties similarity index 100% rename from product/modules/agents/android/client/assets/config.properties rename to product/modules/mobileservices/agents/android/client/assets/config.properties diff --git a/product/modules/agents/android/client/bin/AndroidManifest.xml b/product/modules/mobileservices/agents/android/client/bin/AndroidManifest.xml similarity index 100% rename from product/modules/agents/android/client/bin/AndroidManifest.xml rename to product/modules/mobileservices/agents/android/client/bin/AndroidManifest.xml diff --git a/product/modules/agents/android/client/bin/R.txt b/product/modules/mobileservices/agents/android/client/bin/R.txt similarity index 100% rename from product/modules/agents/android/client/bin/R.txt rename to product/modules/mobileservices/agents/android/client/bin/R.txt diff --git a/product/modules/agents/android/client/bin/cdm-agent.apk b/product/modules/mobileservices/agents/android/client/bin/cdm-agent.apk similarity index 100% rename from product/modules/agents/android/client/bin/cdm-agent.apk rename to product/modules/mobileservices/agents/android/client/bin/cdm-agent.apk diff --git a/product/modules/agents/android/client/bin/classes.dex b/product/modules/mobileservices/agents/android/client/bin/classes.dex similarity index 100% rename from product/modules/agents/android/client/bin/classes.dex rename to product/modules/mobileservices/agents/android/client/bin/classes.dex diff --git a/product/modules/agents/android/client/bin/dexedLibs/android-support-v4-ac241410a4abbf80a4b32bc9c83281a0.jar b/product/modules/mobileservices/agents/android/client/bin/dexedLibs/android-support-v4-ac241410a4abbf80a4b32bc9c83281a0.jar similarity index 100% rename from product/modules/agents/android/client/bin/dexedLibs/android-support-v4-ac241410a4abbf80a4b32bc9c83281a0.jar rename to product/modules/mobileservices/agents/android/client/bin/dexedLibs/android-support-v4-ac241410a4abbf80a4b32bc9c83281a0.jar diff --git a/product/modules/agents/android/client/bin/dexedLibs/commons-codec-1.2-8ab7bcad84afcfb11444785a20fab16a.jar b/product/modules/mobileservices/agents/android/client/bin/dexedLibs/commons-codec-1.2-8ab7bcad84afcfb11444785a20fab16a.jar similarity index 100% rename from product/modules/agents/android/client/bin/dexedLibs/commons-codec-1.2-8ab7bcad84afcfb11444785a20fab16a.jar rename to product/modules/mobileservices/agents/android/client/bin/dexedLibs/commons-codec-1.2-8ab7bcad84afcfb11444785a20fab16a.jar diff --git a/product/modules/agents/android/client/bin/dexedLibs/gcm-9a0931d46c58ab74a433ccfc2b28f225.jar b/product/modules/mobileservices/agents/android/client/bin/dexedLibs/gcm-9a0931d46c58ab74a433ccfc2b28f225.jar similarity index 100% rename from product/modules/agents/android/client/bin/dexedLibs/gcm-9a0931d46c58ab74a433ccfc2b28f225.jar rename to product/modules/mobileservices/agents/android/client/bin/dexedLibs/gcm-9a0931d46c58ab74a433ccfc2b28f225.jar diff --git a/product/modules/agents/android/client/bin/dexedLibs/json-simple-1.1.1-b2941873388ec1326a64a93caf86e8ae.jar b/product/modules/mobileservices/agents/android/client/bin/dexedLibs/json-simple-1.1.1-b2941873388ec1326a64a93caf86e8ae.jar similarity index 100% rename from product/modules/agents/android/client/bin/dexedLibs/json-simple-1.1.1-b2941873388ec1326a64a93caf86e8ae.jar rename to product/modules/mobileservices/agents/android/client/bin/dexedLibs/json-simple-1.1.1-b2941873388ec1326a64a93caf86e8ae.jar diff --git a/product/modules/agents/android/client/bin/dexedLibs/library-33cf4968ac75ef373184aa60c48ed2e2.jar b/product/modules/mobileservices/agents/android/client/bin/dexedLibs/library-33cf4968ac75ef373184aa60c48ed2e2.jar similarity index 100% rename from product/modules/agents/android/client/bin/dexedLibs/library-33cf4968ac75ef373184aa60c48ed2e2.jar rename to product/modules/mobileservices/agents/android/client/bin/dexedLibs/library-33cf4968ac75ef373184aa60c48ed2e2.jar diff --git a/product/modules/agents/android/client/bin/jarlist.cache b/product/modules/mobileservices/agents/android/client/bin/jarlist.cache similarity index 100% rename from product/modules/agents/android/client/bin/jarlist.cache rename to product/modules/mobileservices/agents/android/client/bin/jarlist.cache diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/ic_bookmark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_bookmark.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/ic_bookmark.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_bookmark.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/ic_check_default.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_check_default.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/ic_check_default.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_check_default.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/ic_check_selected.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_check_selected.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/ic_check_selected.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_check_selected.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/ic_launcher.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_launcher.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/ic_launcher.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_launcher.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/ic_logo.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_logo.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/ic_logo.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_logo.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/ic_logo_dark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_logo_dark.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/ic_logo_dark.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_logo_dark.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/ic_stat_gcm.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_stat_gcm.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/ic_stat_gcm.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_stat_gcm.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/option_icon.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/option_icon.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/option_icon.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/option_icon.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/repeat_bg.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/repeat_bg.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/repeat_bg.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/repeat_bg.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/top_bar.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/top_bar.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-hdpi/top_bar.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/top_bar.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/ic_bookmark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_bookmark.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/ic_bookmark.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_bookmark.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/ic_check_default.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_check_default.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/ic_check_default.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_check_default.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/ic_check_selected.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_check_selected.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/ic_check_selected.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_check_selected.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/ic_launcher.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_launcher.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/ic_launcher.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_launcher.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/ic_logo.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_logo.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/ic_logo.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_logo.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/ic_logo_dark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_logo_dark.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/ic_logo_dark.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_logo_dark.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/option_icon.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/option_icon.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/option_icon.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/option_icon.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/top_bar.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/top_bar.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-mdpi/top_bar.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/top_bar.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/appinstall.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/appinstall.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/appinstall.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/appinstall.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/applist.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/applist.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/applist.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/applist.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/appuninstall.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/appuninstall.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/appuninstall.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/appuninstall.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/camera.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/camera.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/camera.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/camera.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/changepassword.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/changepassword.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/changepassword.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/changepassword.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/encrypt.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/encrypt.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/encrypt.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/encrypt.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_bookmark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_bookmark.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_bookmark.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_bookmark.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_check_default.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_check_default.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_check_default.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_check_default.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_check_selected.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_check_selected.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_check_selected.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_check_selected.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_launcher.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_launcher.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_launcher.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_launcher.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_logo.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_logo.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_logo.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_logo.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_logo_dark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_logo_dark.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_logo_dark.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_logo_dark.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/info.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/info.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/info.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/info.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/location.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/location.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/location.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/location.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/lock.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/lock.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/lock.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/lock.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/mute.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/mute.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/mute.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/mute.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/notification.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/notification.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/notification.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/notification.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/repeat_bg.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/repeat_bg.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/repeat_bg.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/repeat_bg.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/wifi.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/wifi.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/wifi.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/wifi.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/wipe.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/wipe.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xhdpi/wipe.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/wipe.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_bookmark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_bookmark.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_bookmark.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_bookmark.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_check_default.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_check_default.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_check_default.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_check_default.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_check_selected.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_check_selected.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_check_selected.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_check_selected.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_launcher.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_launcher.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_launcher.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_logo.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_logo.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_logo.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_logo.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_logo_dark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_logo_dark.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_logo_dark.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_logo_dark.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable-xxhdpi/repeat_bg.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/repeat_bg.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable-xxhdpi/repeat_bg.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/repeat_bg.png diff --git a/product/modules/agents/android/client/bin/res/crunch/drawable/dot.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable/dot.png similarity index 100% rename from product/modules/agents/android/client/bin/res/crunch/drawable/dot.png rename to product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable/dot.png diff --git a/product/modules/agents/android/client/bin/resources.ap_ b/product/modules/mobileservices/agents/android/client/bin/resources.ap_ similarity index 100% rename from product/modules/agents/android/client/bin/resources.ap_ rename to product/modules/mobileservices/agents/android/client/bin/resources.ap_ diff --git a/product/modules/agents/android/client/libs/android-support-v4.jar b/product/modules/mobileservices/agents/android/client/libs/android-support-v4.jar similarity index 100% rename from product/modules/agents/android/client/libs/android-support-v4.jar rename to product/modules/mobileservices/agents/android/client/libs/android-support-v4.jar diff --git a/product/modules/agents/android/client/libs/commons-codec-1.2.jar b/product/modules/mobileservices/agents/android/client/libs/commons-codec-1.2.jar similarity index 100% rename from product/modules/agents/android/client/libs/commons-codec-1.2.jar rename to product/modules/mobileservices/agents/android/client/libs/commons-codec-1.2.jar diff --git a/product/modules/agents/android/client/libs/gcm.jar b/product/modules/mobileservices/agents/android/client/libs/gcm.jar similarity index 100% rename from product/modules/agents/android/client/libs/gcm.jar rename to product/modules/mobileservices/agents/android/client/libs/gcm.jar diff --git a/product/modules/agents/android/client/libs/json-simple-1.1.1.jar b/product/modules/mobileservices/agents/android/client/libs/json-simple-1.1.1.jar similarity index 100% rename from product/modules/agents/android/client/libs/json-simple-1.1.1.jar rename to product/modules/mobileservices/agents/android/client/libs/json-simple-1.1.1.jar diff --git a/product/modules/agents/android/client/lint.xml b/product/modules/mobileservices/agents/android/client/lint.xml similarity index 100% rename from product/modules/agents/android/client/lint.xml rename to product/modules/mobileservices/agents/android/client/lint.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/.gitignore b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/.gitignore similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/.gitignore rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/.gitignore diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/.travis.yml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/.travis.yml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/.travis.yml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/.travis.yml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/CHANGELOG.md b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/CHANGELOG.md similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/CHANGELOG.md rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/CHANGELOG.md diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/CONTRIBUTING.md b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/CONTRIBUTING.md similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/CONTRIBUTING.md rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/CONTRIBUTING.md diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/LICENSE.txt b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/LICENSE.txt similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/LICENSE.txt rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/LICENSE.txt diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/README.md b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/README.md similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/README.md rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/README.md diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/checkstyle.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/checkstyle.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/checkstyle.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/checkstyle.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/AndroidManifest.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/AndroidManifest.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/AndroidManifest.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/AndroidManifest.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/README.md b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/README.md similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/README.md rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/README.md diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/build.gradle b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/build.gradle similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/build.gradle rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/build.gradle diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/libs/android-support-v4.jar b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/libs/android-support-v4.jar similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/libs/android-support-v4.jar rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/libs/android-support-v4.jar diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/pom.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/pom.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/pom.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/pom.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/project.properties b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/project.properties similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/project.properties rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/project.properties diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_disable_only_holo_dark.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_disable_only_holo_dark.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_disable_only_holo_dark.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_disable_only_holo_dark.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_disable_only_holo_light.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_disable_only_holo_light.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_disable_only_holo_light.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_disable_only_holo_light.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_holo_dark.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_holo_dark.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_holo_dark.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_holo_dark.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_holo_light.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_holo_light.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_holo_light.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/color/abs__primary_text_holo_light.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__dialog_full_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__dialog_full_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__dialog_full_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__dialog_full_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_ab_back_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_cab_done_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_disabled.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_disabled.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_disabled.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_disabled.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_normal.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_normal.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_normal.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_normal.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_go.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_go.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_go.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_go.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_menu_share_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_search.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_search.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_search.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_search.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_search_api_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_search_api_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_search_api_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_search_api_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_voice_search.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_voice_search.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_voice_search.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_voice_search.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_activated_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_activated_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_activated_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_activated_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_divider_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_divider_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_divider_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_divider_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_divider_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_divider_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_divider_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_divider_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_focused_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_focused_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_focused_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_focused_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_longpressed_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_longpressed_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_longpressed_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_longpressed_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_pressed_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_pressed_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_pressed_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_pressed_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_bg_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_bg_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_bg_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_bg_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_primary_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_primary_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_primary_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_primary_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_48_inner_holo.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_48_inner_holo.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_48_inner_holo.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_48_inner_holo.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_48_outer_holo.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_48_outer_holo.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_48_outer_holo.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_48_outer_holo.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_selected_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_selected_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_selected_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_selected_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_solid_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_solid_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_solid_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_solid_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__dialog_full_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__dialog_full_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__dialog_full_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__dialog_full_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_ab_back_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_ab_back_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_ab_back_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_ab_back_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_cab_done_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_cab_done_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_cab_done_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_cab_done_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_disabled.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_disabled.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_disabled.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_disabled.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_normal.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_normal.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_normal.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_normal.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_go.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_go.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_go.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_go.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_share_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_share_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_share_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_menu_share_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_search.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_search.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_search.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_search.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_search_api_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_search_api_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_search_api_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_search_api_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_voice_search.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_voice_search.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_voice_search.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_voice_search.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_activated_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_activated_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_activated_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_activated_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_divider_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_divider_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_divider_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_divider_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_divider_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_divider_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_divider_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_divider_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_focused_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_focused_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_focused_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_focused_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_longpressed_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_longpressed_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_longpressed_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_longpressed_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_pressed_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_pressed_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_pressed_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_pressed_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_bg_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_bg_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_bg_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_bg_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_primary_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_primary_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_primary_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_primary_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_48_inner_holo.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_48_inner_holo.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_48_inner_holo.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_48_inner_holo.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_48_outer_holo.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_48_outer_holo.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_48_outer_holo.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_48_outer_holo.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_selected_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_selected_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_selected_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_selected_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-v11/abs__progress_medium_holo.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-v11/abs__progress_medium_holo.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-v11/abs__progress_medium_holo.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-v11/abs__progress_medium_holo.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_clear_disabled.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_clear_disabled.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_clear_disabled.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_clear_disabled.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_go.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_go.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_go.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_go.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_search.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_search.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_search.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_search.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_search_api_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_search_api_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_search_api_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_search_api_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_voice_search.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_voice_search.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_voice_search.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_voice_search.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_activated_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_activated_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_activated_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_activated_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_divider_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_divider_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_divider_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_divider_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_focused_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_focused_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_focused_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_focused_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_longpressed_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_longpressed_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_longpressed_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_longpressed_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_48_inner_holo.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_48_inner_holo.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_48_inner_holo.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_48_inner_holo.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_48_outer_holo.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_48_outer_holo.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_48_outer_holo.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_48_outer_holo.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_selected_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_selected_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_selected_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_selected_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__activated_background_holo_dark.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__activated_background_holo_dark.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__activated_background_holo_dark.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__activated_background_holo_dark.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__activated_background_holo_light.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__activated_background_holo_light.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__activated_background_holo_light.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__activated_background_holo_light.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__btn_cab_done_holo_dark.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__btn_cab_done_holo_dark.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__btn_cab_done_holo_dark.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__btn_cab_done_holo_dark.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__btn_cab_done_holo_light.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__btn_cab_done_holo_light.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__btn_cab_done_holo_light.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__btn_cab_done_holo_light.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_clear.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_clear.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_clear.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_clear.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_clear_holo_light.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_clear_holo_light.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_clear_holo_light.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_clear_holo_light.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__item_background_holo_dark.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__item_background_holo_dark.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__item_background_holo_dark.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__item_background_holo_dark.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__item_background_holo_light.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__item_background_holo_light.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__item_background_holo_light.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__item_background_holo_light.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_background_transition_holo_dark.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_background_transition_holo_dark.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_background_transition_holo_dark.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_background_transition_holo_dark.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_background_transition_holo_light.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_background_transition_holo_light.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_background_transition_holo_light.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_background_transition_holo_light.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_holo_dark.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_holo_dark.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_holo_dark.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_holo_dark.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_holo_light.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_holo_light.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_holo_light.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__list_selector_holo_light.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__progress_horizontal_holo_dark.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__progress_horizontal_holo_dark.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__progress_horizontal_holo_dark.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__progress_horizontal_holo_dark.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__progress_horizontal_holo_light.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__progress_horizontal_holo_light.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__progress_horizontal_holo_light.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__progress_horizontal_holo_light.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__progress_medium_holo.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__progress_medium_holo.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__progress_medium_holo.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__progress_medium_holo.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__search_dropdown_dark.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__search_dropdown_dark.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__search_dropdown_dark.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__search_dropdown_dark.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__search_dropdown_light.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__search_dropdown_light.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__search_dropdown_light.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__search_dropdown_light.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__spinner_ab_holo_dark.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__spinner_ab_holo_dark.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__spinner_ab_holo_dark.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__spinner_ab_holo_dark.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__spinner_ab_holo_light.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__spinner_ab_holo_light.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__spinner_ab_holo_light.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__spinner_ab_holo_light.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__tab_indicator_ab_holo.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__tab_indicator_ab_holo.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__tab_indicator_ab_holo.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__tab_indicator_ab_holo.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_holo_dark.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_holo_dark.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_holo_dark.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_holo_dark.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_holo_light.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_holo_light.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_holo_light.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_holo_light.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_right_holo_dark.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_right_holo_dark.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_right_holo_dark.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_right_holo_dark.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_right_holo_light.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_right_holo_light.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_right_holo_light.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/drawable/abs__textfield_searchview_right_holo_light.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout-large/abs__action_mode_close_item.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout-large/abs__action_mode_close_item.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout-large/abs__action_mode_close_item.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout-large/abs__action_mode_close_item.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout-v14/sherlock_spinner_dropdown_item.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout-v14/sherlock_spinner_dropdown_item.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout-v14/sherlock_spinner_dropdown_item.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout-v14/sherlock_spinner_dropdown_item.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout-v14/sherlock_spinner_item.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout-v14/sherlock_spinner_item.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout-v14/sherlock_spinner_item.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout-v14/sherlock_spinner_item.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout-xlarge/abs__screen_action_bar.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout-xlarge/abs__screen_action_bar.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout-xlarge/abs__screen_action_bar.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout-xlarge/abs__screen_action_bar.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout-xlarge/abs__screen_action_bar_overlay.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout-xlarge/abs__screen_action_bar_overlay.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout-xlarge/abs__screen_action_bar_overlay.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout-xlarge/abs__screen_action_bar_overlay.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_home.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_home.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_home.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_home.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_tab.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_tab.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_tab.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_tab.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_tab_bar_view.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_tab_bar_view.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_tab_bar_view.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_tab_bar_view.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_title_item.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_title_item.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_title_item.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_bar_title_item.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_menu_item_layout.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_menu_item_layout.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_menu_item_layout.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_menu_item_layout.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_menu_layout.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_menu_layout.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_menu_layout.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_menu_layout.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_mode_bar.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_mode_bar.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_mode_bar.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_mode_bar.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_mode_close_item.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_mode_close_item.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_mode_close_item.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__action_mode_close_item.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__activity_chooser_view.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__activity_chooser_view.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__activity_chooser_view.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__activity_chooser_view.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__activity_chooser_view_list_item.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__activity_chooser_view_list_item.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__activity_chooser_view_list_item.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__activity_chooser_view_list_item.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__dialog_title_holo.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__dialog_title_holo.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__dialog_title_holo.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__dialog_title_holo.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_checkbox.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_checkbox.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_checkbox.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_checkbox.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_icon.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_icon.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_icon.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_icon.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_layout.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_layout.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_layout.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_layout.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_radio.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_radio.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_radio.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__list_menu_item_radio.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__popup_menu_item_layout.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__popup_menu_item_layout.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__popup_menu_item_layout.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__popup_menu_item_layout.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_action_bar.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_action_bar.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_action_bar.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_action_bar.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_action_bar_overlay.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_action_bar_overlay.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_action_bar_overlay.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_action_bar_overlay.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_simple.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_simple.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_simple.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_simple.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_simple_overlay_action_mode.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_simple_overlay_action_mode.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_simple_overlay_action_mode.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__screen_simple_overlay_action_mode.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__search_dropdown_item_icons_2line.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__search_dropdown_item_icons_2line.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__search_dropdown_item_icons_2line.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__search_dropdown_item_icons_2line.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__search_view.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__search_view.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__search_view.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__search_view.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__simple_dropdown_hint.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__simple_dropdown_hint.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__simple_dropdown_hint.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/abs__simple_dropdown_hint.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/sherlock_spinner_dropdown_item.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/sherlock_spinner_dropdown_item.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/sherlock_spinner_dropdown_item.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/sherlock_spinner_dropdown_item.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/sherlock_spinner_item.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/sherlock_spinner_item.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/layout/sherlock_spinner_item.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/layout/sherlock_spinner_item.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-land/abs__dimens.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-land/abs__dimens.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-land/abs__dimens.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-land/abs__dimens.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-hdpi-1024x600/abs__dimens.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-hdpi-1024x600/abs__dimens.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-hdpi-1024x600/abs__dimens.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-hdpi-1024x600/abs__dimens.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-land-hdpi-1024x600/abs__dimens.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-land-hdpi-1024x600/abs__dimens.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-land-hdpi-1024x600/abs__dimens.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-land-hdpi-1024x600/abs__dimens.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-land-mdpi-1024x600/abs__dimens.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-land-mdpi-1024x600/abs__dimens.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-land-mdpi-1024x600/abs__dimens.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-land-mdpi-1024x600/abs__dimens.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-mdpi-1024x600/abs__dimens.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-mdpi-1024x600/abs__dimens.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-mdpi-1024x600/abs__dimens.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-large-mdpi-1024x600/abs__dimens.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-large/abs__dimens.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-large/abs__dimens.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-large/abs__dimens.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-large/abs__dimens.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-sw600dp/abs__bools.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-sw600dp/abs__bools.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-sw600dp/abs__bools.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-sw600dp/abs__bools.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-sw600dp/abs__dimens.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-sw600dp/abs__dimens.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-sw600dp/abs__dimens.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-sw600dp/abs__dimens.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-v11/abs__themes.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-v11/abs__themes.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-v11/abs__themes.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-v11/abs__themes.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-v14/abs__styles.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-v14/abs__styles.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-v14/abs__styles.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-v14/abs__styles.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-v14/abs__themes.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-v14/abs__themes.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-v14/abs__themes.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-v14/abs__themes.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-w360dp/abs__dimens.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-w360dp/abs__dimens.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-w360dp/abs__dimens.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-w360dp/abs__dimens.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-w480dp/abs__bools.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-w480dp/abs__bools.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-w480dp/abs__bools.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-w480dp/abs__bools.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-w480dp/abs__config.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-w480dp/abs__config.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-w480dp/abs__config.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-w480dp/abs__config.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-w500dp/abs__dimens.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-w500dp/abs__dimens.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-w500dp/abs__dimens.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-w500dp/abs__dimens.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-w600dp/abs__dimens.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-w600dp/abs__dimens.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-w600dp/abs__dimens.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-w600dp/abs__dimens.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-xlarge/abs__dimens.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-xlarge/abs__dimens.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values-xlarge/abs__dimens.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values-xlarge/abs__dimens.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__attrs.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__attrs.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__attrs.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__attrs.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__bools.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__bools.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__bools.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__bools.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__colors.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__colors.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__colors.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__colors.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__config.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__config.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__config.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__config.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__dimens.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__dimens.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__dimens.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__dimens.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__ids.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__ids.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__ids.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__ids.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__strings.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__strings.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__strings.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__strings.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__styles.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__styles.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__styles.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__styles.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__themes.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__themes.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__themes.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/res/values/abs__themes.xml diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/android/support/v4/app/Watson.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/android/support/v4/app/Watson.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/android/support/v4/app/Watson.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/android/support/v4/app/Watson.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/ActionBarSherlock.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/ActionBarSherlock.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/ActionBarSherlock.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/ActionBarSherlock.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/ActionBar.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/ActionBar.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/ActionBar.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/ActionBar.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockActivity.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockActivity.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockActivity.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockActivity.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockDialogFragment.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockDialogFragment.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockDialogFragment.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockDialogFragment.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockFragment.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockFragment.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockFragment.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockFragment.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockFragmentActivity.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockFragmentActivity.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockFragmentActivity.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockFragmentActivity.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockListActivity.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockListActivity.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockListActivity.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockListActivity.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockListFragment.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockListFragment.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockListFragment.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockListFragment.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/ResourcesCompat.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/ResourcesCompat.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/ResourcesCompat.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/ResourcesCompat.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/app/ActionBarImpl.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/app/ActionBarImpl.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/app/ActionBarImpl.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/app/ActionBarImpl.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuView.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuView.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuView.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuView.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarView.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarView.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarView.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ActionBarView.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsSpinner.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsSpinner.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsSpinner.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsSpinner.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsView.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsView.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsView.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/IcsView.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/ActionMode.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/ActionMode.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/ActionMode.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/ActionMode.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/ActionProvider.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/ActionProvider.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/ActionProvider.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/ActionProvider.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/CollapsibleActionView.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/CollapsibleActionView.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/CollapsibleActionView.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/CollapsibleActionView.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/Menu.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/Menu.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/Menu.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/Menu.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/MenuInflater.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/MenuInflater.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/MenuInflater.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/MenuInflater.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/MenuItem.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/MenuItem.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/MenuItem.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/MenuItem.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/SubMenu.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/SubMenu.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/SubMenu.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/SubMenu.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/Window.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/Window.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/Window.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/view/Window.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/ActivityChooserModel.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/ActivityChooserModel.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/ActivityChooserModel.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/ActivityChooserModel.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/ActivityChooserView.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/ActivityChooserView.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/ActivityChooserView.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/ActivityChooserView.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/SearchView.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/SearchView.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/SearchView.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/SearchView.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/ShareActionProvider.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/ShareActionProvider.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/ShareActionProvider.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/ShareActionProvider.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/SuggestionsAdapter.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/SuggestionsAdapter.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/SuggestionsAdapter.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/src/com/actionbarsherlock/widget/SuggestionsAdapter.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/library/test/com/actionbarsherlock/internal/ManifestParsingTest.java b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/test/com/actionbarsherlock/internal/ManifestParsingTest.java similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/library/test/com/actionbarsherlock/internal/ManifestParsingTest.java rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/test/com/actionbarsherlock/internal/ManifestParsingTest.java diff --git a/product/modules/agents/android/client/plugins/ActionBarSherlock/pom.xml b/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/pom.xml similarity index 100% rename from product/modules/agents/android/client/plugins/ActionBarSherlock/pom.xml rename to product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/pom.xml diff --git a/product/modules/agents/android/client/proguard-project.txt b/product/modules/mobileservices/agents/android/client/proguard-project.txt similarity index 100% rename from product/modules/agents/android/client/proguard-project.txt rename to product/modules/mobileservices/agents/android/client/proguard-project.txt diff --git a/product/modules/agents/android/client/project.properties b/product/modules/mobileservices/agents/android/client/project.properties similarity index 100% rename from product/modules/agents/android/client/project.properties rename to product/modules/mobileservices/agents/android/client/project.properties diff --git a/product/modules/agents/android/client/res/drawable-hdpi/ic_bookmark.png b/product/modules/mobileservices/agents/android/client/res/drawable-hdpi/ic_bookmark.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-hdpi/ic_bookmark.png rename to product/modules/mobileservices/agents/android/client/res/drawable-hdpi/ic_bookmark.png diff --git a/product/modules/agents/android/client/res/drawable-hdpi/ic_check_default.png b/product/modules/mobileservices/agents/android/client/res/drawable-hdpi/ic_check_default.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-hdpi/ic_check_default.png rename to product/modules/mobileservices/agents/android/client/res/drawable-hdpi/ic_check_default.png diff --git a/product/modules/agents/android/client/res/drawable-hdpi/ic_check_selected.png b/product/modules/mobileservices/agents/android/client/res/drawable-hdpi/ic_check_selected.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-hdpi/ic_check_selected.png rename to product/modules/mobileservices/agents/android/client/res/drawable-hdpi/ic_check_selected.png diff --git a/product/modules/agents/android/client/res/drawable-hdpi/ic_launcher.png b/product/modules/mobileservices/agents/android/client/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-hdpi/ic_launcher.png rename to product/modules/mobileservices/agents/android/client/res/drawable-hdpi/ic_launcher.png diff --git a/product/modules/agents/android/client/res/drawable-hdpi/ic_logo.png b/product/modules/mobileservices/agents/android/client/res/drawable-hdpi/ic_logo.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-hdpi/ic_logo.png rename to product/modules/mobileservices/agents/android/client/res/drawable-hdpi/ic_logo.png diff --git a/product/modules/agents/android/client/res/drawable-hdpi/ic_logo_dark.png b/product/modules/mobileservices/agents/android/client/res/drawable-hdpi/ic_logo_dark.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-hdpi/ic_logo_dark.png rename to product/modules/mobileservices/agents/android/client/res/drawable-hdpi/ic_logo_dark.png diff --git a/product/modules/agents/android/client/res/drawable-hdpi/ic_stat_gcm.png b/product/modules/mobileservices/agents/android/client/res/drawable-hdpi/ic_stat_gcm.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-hdpi/ic_stat_gcm.png rename to product/modules/mobileservices/agents/android/client/res/drawable-hdpi/ic_stat_gcm.png diff --git a/product/modules/agents/android/client/res/drawable-hdpi/option_icon.png b/product/modules/mobileservices/agents/android/client/res/drawable-hdpi/option_icon.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-hdpi/option_icon.png rename to product/modules/mobileservices/agents/android/client/res/drawable-hdpi/option_icon.png diff --git a/product/modules/agents/android/client/res/drawable-hdpi/repeat_bg.png b/product/modules/mobileservices/agents/android/client/res/drawable-hdpi/repeat_bg.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-hdpi/repeat_bg.png rename to product/modules/mobileservices/agents/android/client/res/drawable-hdpi/repeat_bg.png diff --git a/product/modules/agents/android/client/res/drawable-hdpi/top_bar.png b/product/modules/mobileservices/agents/android/client/res/drawable-hdpi/top_bar.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-hdpi/top_bar.png rename to product/modules/mobileservices/agents/android/client/res/drawable-hdpi/top_bar.png diff --git a/product/modules/agents/android/client/res/drawable-mdpi/ic_bookmark.png b/product/modules/mobileservices/agents/android/client/res/drawable-mdpi/ic_bookmark.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-mdpi/ic_bookmark.png rename to product/modules/mobileservices/agents/android/client/res/drawable-mdpi/ic_bookmark.png diff --git a/product/modules/agents/android/client/res/drawable-mdpi/ic_check_default.png b/product/modules/mobileservices/agents/android/client/res/drawable-mdpi/ic_check_default.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-mdpi/ic_check_default.png rename to product/modules/mobileservices/agents/android/client/res/drawable-mdpi/ic_check_default.png diff --git a/product/modules/agents/android/client/res/drawable-mdpi/ic_check_selected.png b/product/modules/mobileservices/agents/android/client/res/drawable-mdpi/ic_check_selected.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-mdpi/ic_check_selected.png rename to product/modules/mobileservices/agents/android/client/res/drawable-mdpi/ic_check_selected.png diff --git a/product/modules/agents/android/client/res/drawable-mdpi/ic_launcher.png b/product/modules/mobileservices/agents/android/client/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-mdpi/ic_launcher.png rename to product/modules/mobileservices/agents/android/client/res/drawable-mdpi/ic_launcher.png diff --git a/product/modules/agents/android/client/res/drawable-mdpi/ic_logo.png b/product/modules/mobileservices/agents/android/client/res/drawable-mdpi/ic_logo.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-mdpi/ic_logo.png rename to product/modules/mobileservices/agents/android/client/res/drawable-mdpi/ic_logo.png diff --git a/product/modules/agents/android/client/res/drawable-mdpi/ic_logo_dark.png b/product/modules/mobileservices/agents/android/client/res/drawable-mdpi/ic_logo_dark.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-mdpi/ic_logo_dark.png rename to product/modules/mobileservices/agents/android/client/res/drawable-mdpi/ic_logo_dark.png diff --git a/product/modules/agents/android/client/res/drawable-mdpi/option_icon.png b/product/modules/mobileservices/agents/android/client/res/drawable-mdpi/option_icon.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-mdpi/option_icon.png rename to product/modules/mobileservices/agents/android/client/res/drawable-mdpi/option_icon.png diff --git a/product/modules/agents/android/client/res/drawable-mdpi/top_bar.png b/product/modules/mobileservices/agents/android/client/res/drawable-mdpi/top_bar.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-mdpi/top_bar.png rename to product/modules/mobileservices/agents/android/client/res/drawable-mdpi/top_bar.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/appinstall.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/appinstall.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/appinstall.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/appinstall.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/applist.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/applist.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/applist.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/applist.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/appuninstall.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/appuninstall.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/appuninstall.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/appuninstall.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/camera.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/camera.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/camera.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/camera.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/changepassword.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/changepassword.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/changepassword.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/changepassword.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/encrypt.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/encrypt.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/encrypt.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/encrypt.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/ic_bookmark.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/ic_bookmark.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/ic_bookmark.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/ic_bookmark.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/ic_check_default.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/ic_check_default.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/ic_check_default.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/ic_check_default.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/ic_check_selected.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/ic_check_selected.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/ic_check_selected.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/ic_check_selected.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/ic_launcher.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/ic_launcher.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/ic_launcher.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/ic_logo.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/ic_logo.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/ic_logo.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/ic_logo.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/ic_logo_dark.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/ic_logo_dark.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/ic_logo_dark.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/ic_logo_dark.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/info.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/info.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/info.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/info.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/location.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/location.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/location.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/location.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/lock.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/lock.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/lock.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/lock.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/mute.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/mute.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/mute.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/mute.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/notification.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/notification.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/notification.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/notification.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/repeat_bg.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/repeat_bg.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/repeat_bg.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/repeat_bg.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/wifi.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/wifi.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/wifi.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/wifi.png diff --git a/product/modules/agents/android/client/res/drawable-xhdpi/wipe.png b/product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/wipe.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xhdpi/wipe.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xhdpi/wipe.png diff --git a/product/modules/agents/android/client/res/drawable-xxhdpi/ic_bookmark.png b/product/modules/mobileservices/agents/android/client/res/drawable-xxhdpi/ic_bookmark.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xxhdpi/ic_bookmark.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xxhdpi/ic_bookmark.png diff --git a/product/modules/agents/android/client/res/drawable-xxhdpi/ic_check_default.png b/product/modules/mobileservices/agents/android/client/res/drawable-xxhdpi/ic_check_default.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xxhdpi/ic_check_default.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xxhdpi/ic_check_default.png diff --git a/product/modules/agents/android/client/res/drawable-xxhdpi/ic_check_selected.png b/product/modules/mobileservices/agents/android/client/res/drawable-xxhdpi/ic_check_selected.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xxhdpi/ic_check_selected.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xxhdpi/ic_check_selected.png diff --git a/product/modules/agents/android/client/res/drawable-xxhdpi/ic_launcher.png b/product/modules/mobileservices/agents/android/client/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xxhdpi/ic_launcher.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xxhdpi/ic_launcher.png diff --git a/product/modules/agents/android/client/res/drawable-xxhdpi/ic_logo.png b/product/modules/mobileservices/agents/android/client/res/drawable-xxhdpi/ic_logo.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xxhdpi/ic_logo.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xxhdpi/ic_logo.png diff --git a/product/modules/agents/android/client/res/drawable-xxhdpi/ic_logo_dark.png b/product/modules/mobileservices/agents/android/client/res/drawable-xxhdpi/ic_logo_dark.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xxhdpi/ic_logo_dark.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xxhdpi/ic_logo_dark.png diff --git a/product/modules/agents/android/client/res/drawable-xxhdpi/repeat_bg.png b/product/modules/mobileservices/agents/android/client/res/drawable-xxhdpi/repeat_bg.png similarity index 100% rename from product/modules/agents/android/client/res/drawable-xxhdpi/repeat_bg.png rename to product/modules/mobileservices/agents/android/client/res/drawable-xxhdpi/repeat_bg.png diff --git a/product/modules/agents/android/client/res/drawable/btn_grey.xml b/product/modules/mobileservices/agents/android/client/res/drawable/btn_grey.xml similarity index 100% rename from product/modules/agents/android/client/res/drawable/btn_grey.xml rename to product/modules/mobileservices/agents/android/client/res/drawable/btn_grey.xml diff --git a/product/modules/agents/android/client/res/drawable/btn_orange.xml b/product/modules/mobileservices/agents/android/client/res/drawable/btn_orange.xml similarity index 100% rename from product/modules/agents/android/client/res/drawable/btn_orange.xml rename to product/modules/mobileservices/agents/android/client/res/drawable/btn_orange.xml diff --git a/product/modules/agents/android/client/res/drawable/custom_checkbox.xml b/product/modules/mobileservices/agents/android/client/res/drawable/custom_checkbox.xml similarity index 100% rename from product/modules/agents/android/client/res/drawable/custom_checkbox.xml rename to product/modules/mobileservices/agents/android/client/res/drawable/custom_checkbox.xml diff --git a/product/modules/agents/android/client/res/drawable/dot.png b/product/modules/mobileservices/agents/android/client/res/drawable/dot.png similarity index 100% rename from product/modules/agents/android/client/res/drawable/dot.png rename to product/modules/mobileservices/agents/android/client/res/drawable/dot.png diff --git a/product/modules/agents/android/client/res/drawable/mdm_logo.xml b/product/modules/mobileservices/agents/android/client/res/drawable/mdm_logo.xml similarity index 100% rename from product/modules/agents/android/client/res/drawable/mdm_logo.xml rename to product/modules/mobileservices/agents/android/client/res/drawable/mdm_logo.xml diff --git a/product/modules/agents/android/client/res/layout/activity_agent_settings.xml b/product/modules/mobileservices/agents/android/client/res/layout/activity_agent_settings.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/activity_agent_settings.xml rename to product/modules/mobileservices/agents/android/client/res/layout/activity_agent_settings.xml diff --git a/product/modules/agents/android/client/res/layout/activity_alert.xml b/product/modules/mobileservices/agents/android/client/res/layout/activity_alert.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/activity_alert.xml rename to product/modules/mobileservices/agents/android/client/res/layout/activity_alert.xml diff --git a/product/modules/agents/android/client/res/layout/activity_already_registered.xml b/product/modules/mobileservices/agents/android/client/res/layout/activity_already_registered.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/activity_already_registered.xml rename to product/modules/mobileservices/agents/android/client/res/layout/activity_already_registered.xml diff --git a/product/modules/agents/android/client/res/layout/activity_authentication.xml b/product/modules/mobileservices/agents/android/client/res/layout/activity_authentication.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/activity_authentication.xml rename to product/modules/mobileservices/agents/android/client/res/layout/activity_authentication.xml diff --git a/product/modules/agents/android/client/res/layout/activity_authentication_error.xml b/product/modules/mobileservices/agents/android/client/res/layout/activity_authentication_error.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/activity_authentication_error.xml rename to product/modules/mobileservices/agents/android/client/res/layout/activity_authentication_error.xml diff --git a/product/modules/agents/android/client/res/layout/activity_available_operations.xml b/product/modules/mobileservices/agents/android/client/res/layout/activity_available_operations.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/activity_available_operations.xml rename to product/modules/mobileservices/agents/android/client/res/layout/activity_available_operations.xml diff --git a/product/modules/agents/android/client/res/layout/activity_display_device_info.xml b/product/modules/mobileservices/agents/android/client/res/layout/activity_display_device_info.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/activity_display_device_info.xml rename to product/modules/mobileservices/agents/android/client/res/layout/activity_display_device_info.xml diff --git a/product/modules/agents/android/client/res/layout/activity_entry.xml b/product/modules/mobileservices/agents/android/client/res/layout/activity_entry.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/activity_entry.xml rename to product/modules/mobileservices/agents/android/client/res/layout/activity_entry.xml diff --git a/product/modules/agents/android/client/res/layout/activity_log.xml b/product/modules/mobileservices/agents/android/client/res/layout/activity_log.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/activity_log.xml rename to product/modules/mobileservices/agents/android/client/res/layout/activity_log.xml diff --git a/product/modules/agents/android/client/res/layout/activity_main.xml b/product/modules/mobileservices/agents/android/client/res/layout/activity_main.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/activity_main.xml rename to product/modules/mobileservices/agents/android/client/res/layout/activity_main.xml diff --git a/product/modules/agents/android/client/res/layout/activity_notification.xml b/product/modules/mobileservices/agents/android/client/res/layout/activity_notification.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/activity_notification.xml rename to product/modules/mobileservices/agents/android/client/res/layout/activity_notification.xml diff --git a/product/modules/agents/android/client/res/layout/activity_pin_code.xml b/product/modules/mobileservices/agents/android/client/res/layout/activity_pin_code.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/activity_pin_code.xml rename to product/modules/mobileservices/agents/android/client/res/layout/activity_pin_code.xml diff --git a/product/modules/agents/android/client/res/layout/activity_register_successful.xml b/product/modules/mobileservices/agents/android/client/res/layout/activity_register_successful.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/activity_register_successful.xml rename to product/modules/mobileservices/agents/android/client/res/layout/activity_register_successful.xml diff --git a/product/modules/agents/android/client/res/layout/activity_settings.xml b/product/modules/mobileservices/agents/android/client/res/layout/activity_settings.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/activity_settings.xml rename to product/modules/mobileservices/agents/android/client/res/layout/activity_settings.xml diff --git a/product/modules/agents/android/client/res/layout/custom_sherlock_bar.xml b/product/modules/mobileservices/agents/android/client/res/layout/custom_sherlock_bar.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/custom_sherlock_bar.xml rename to product/modules/mobileservices/agents/android/client/res/layout/custom_sherlock_bar.xml diff --git a/product/modules/agents/android/client/res/layout/custom_terms_popup.xml b/product/modules/mobileservices/agents/android/client/res/layout/custom_terms_popup.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/custom_terms_popup.xml rename to product/modules/mobileservices/agents/android/client/res/layout/custom_terms_popup.xml diff --git a/product/modules/agents/android/client/res/layout/footer_repeat.xml b/product/modules/mobileservices/agents/android/client/res/layout/footer_repeat.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/footer_repeat.xml rename to product/modules/mobileservices/agents/android/client/res/layout/footer_repeat.xml diff --git a/product/modules/agents/android/client/res/layout/header_gradient.xml b/product/modules/mobileservices/agents/android/client/res/layout/header_gradient.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/header_gradient.xml rename to product/modules/mobileservices/agents/android/client/res/layout/header_gradient.xml diff --git a/product/modules/agents/android/client/res/layout/login.xml b/product/modules/mobileservices/agents/android/client/res/layout/login.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/login.xml rename to product/modules/mobileservices/agents/android/client/res/layout/login.xml diff --git a/product/modules/agents/android/client/res/layout/main.xml b/product/modules/mobileservices/agents/android/client/res/layout/main.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/main.xml rename to product/modules/mobileservices/agents/android/client/res/layout/main.xml diff --git a/product/modules/agents/android/client/res/layout/notify.xml b/product/modules/mobileservices/agents/android/client/res/layout/notify.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/notify.xml rename to product/modules/mobileservices/agents/android/client/res/layout/notify.xml diff --git a/product/modules/agents/android/client/res/layout/row_with_icon.xml b/product/modules/mobileservices/agents/android/client/res/layout/row_with_icon.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/row_with_icon.xml rename to product/modules/mobileservices/agents/android/client/res/layout/row_with_icon.xml diff --git a/product/modules/agents/android/client/res/layout/simplerow.xml b/product/modules/mobileservices/agents/android/client/res/layout/simplerow.xml similarity index 100% rename from product/modules/agents/android/client/res/layout/simplerow.xml rename to product/modules/mobileservices/agents/android/client/res/layout/simplerow.xml diff --git a/product/modules/agents/android/client/res/menu/agent_settings.xml b/product/modules/mobileservices/agents/android/client/res/menu/agent_settings.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/agent_settings.xml rename to product/modules/mobileservices/agents/android/client/res/menu/agent_settings.xml diff --git a/product/modules/agents/android/client/res/menu/alert.xml b/product/modules/mobileservices/agents/android/client/res/menu/alert.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/alert.xml rename to product/modules/mobileservices/agents/android/client/res/menu/alert.xml diff --git a/product/modules/agents/android/client/res/menu/all_ready_registered.xml b/product/modules/mobileservices/agents/android/client/res/menu/all_ready_registered.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/all_ready_registered.xml rename to product/modules/mobileservices/agents/android/client/res/menu/all_ready_registered.xml diff --git a/product/modules/agents/android/client/res/menu/auth_sherlock_menu.xml b/product/modules/mobileservices/agents/android/client/res/menu/auth_sherlock_menu.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/auth_sherlock_menu.xml rename to product/modules/mobileservices/agents/android/client/res/menu/auth_sherlock_menu.xml diff --git a/product/modules/agents/android/client/res/menu/authentication.xml b/product/modules/mobileservices/agents/android/client/res/menu/authentication.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/authentication.xml rename to product/modules/mobileservices/agents/android/client/res/menu/authentication.xml diff --git a/product/modules/agents/android/client/res/menu/authentication_error.xml b/product/modules/mobileservices/agents/android/client/res/menu/authentication_error.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/authentication_error.xml rename to product/modules/mobileservices/agents/android/client/res/menu/authentication_error.xml diff --git a/product/modules/agents/android/client/res/menu/available_operations.xml b/product/modules/mobileservices/agents/android/client/res/menu/available_operations.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/available_operations.xml rename to product/modules/mobileservices/agents/android/client/res/menu/available_operations.xml diff --git a/product/modules/agents/android/client/res/menu/display_device_info.xml b/product/modules/mobileservices/agents/android/client/res/menu/display_device_info.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/display_device_info.xml rename to product/modules/mobileservices/agents/android/client/res/menu/display_device_info.xml diff --git a/product/modules/agents/android/client/res/menu/entry.xml b/product/modules/mobileservices/agents/android/client/res/menu/entry.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/entry.xml rename to product/modules/mobileservices/agents/android/client/res/menu/entry.xml diff --git a/product/modules/agents/android/client/res/menu/log.xml b/product/modules/mobileservices/agents/android/client/res/menu/log.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/log.xml rename to product/modules/mobileservices/agents/android/client/res/menu/log.xml diff --git a/product/modules/agents/android/client/res/menu/main.xml b/product/modules/mobileservices/agents/android/client/res/menu/main.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/main.xml rename to product/modules/mobileservices/agents/android/client/res/menu/main.xml diff --git a/product/modules/agents/android/client/res/menu/notification.xml b/product/modules/mobileservices/agents/android/client/res/menu/notification.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/notification.xml rename to product/modules/mobileservices/agents/android/client/res/menu/notification.xml diff --git a/product/modules/agents/android/client/res/menu/notify.xml b/product/modules/mobileservices/agents/android/client/res/menu/notify.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/notify.xml rename to product/modules/mobileservices/agents/android/client/res/menu/notify.xml diff --git a/product/modules/agents/android/client/res/menu/options_menu.xml b/product/modules/mobileservices/agents/android/client/res/menu/options_menu.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/options_menu.xml rename to product/modules/mobileservices/agents/android/client/res/menu/options_menu.xml diff --git a/product/modules/agents/android/client/res/menu/pin_code.xml b/product/modules/mobileservices/agents/android/client/res/menu/pin_code.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/pin_code.xml rename to product/modules/mobileservices/agents/android/client/res/menu/pin_code.xml diff --git a/product/modules/agents/android/client/res/menu/register_successful.xml b/product/modules/mobileservices/agents/android/client/res/menu/register_successful.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/register_successful.xml rename to product/modules/mobileservices/agents/android/client/res/menu/register_successful.xml diff --git a/product/modules/agents/android/client/res/menu/settings.xml b/product/modules/mobileservices/agents/android/client/res/menu/settings.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/settings.xml rename to product/modules/mobileservices/agents/android/client/res/menu/settings.xml diff --git a/product/modules/agents/android/client/res/menu/sherlock_menu.xml b/product/modules/mobileservices/agents/android/client/res/menu/sherlock_menu.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/sherlock_menu.xml rename to product/modules/mobileservices/agents/android/client/res/menu/sherlock_menu.xml diff --git a/product/modules/agents/android/client/res/menu/sherlock_menu_debug.xml b/product/modules/mobileservices/agents/android/client/res/menu/sherlock_menu_debug.xml similarity index 100% rename from product/modules/agents/android/client/res/menu/sherlock_menu_debug.xml rename to product/modules/mobileservices/agents/android/client/res/menu/sherlock_menu_debug.xml diff --git a/product/modules/agents/android/client/res/raw/emm_truststore.bks b/product/modules/mobileservices/agents/android/client/res/raw/emm_truststore.bks similarity index 100% rename from product/modules/agents/android/client/res/raw/emm_truststore.bks rename to product/modules/mobileservices/agents/android/client/res/raw/emm_truststore.bks diff --git a/product/modules/agents/android/client/res/values-sw600dp/dimens.xml b/product/modules/mobileservices/agents/android/client/res/values-sw600dp/dimens.xml similarity index 100% rename from product/modules/agents/android/client/res/values-sw600dp/dimens.xml rename to product/modules/mobileservices/agents/android/client/res/values-sw600dp/dimens.xml diff --git a/product/modules/agents/android/client/res/values-sw720dp-land/dimens.xml b/product/modules/mobileservices/agents/android/client/res/values-sw720dp-land/dimens.xml similarity index 100% rename from product/modules/agents/android/client/res/values-sw720dp-land/dimens.xml rename to product/modules/mobileservices/agents/android/client/res/values-sw720dp-land/dimens.xml diff --git a/product/modules/agents/android/client/res/values-v11/styles.xml b/product/modules/mobileservices/agents/android/client/res/values-v11/styles.xml similarity index 100% rename from product/modules/agents/android/client/res/values-v11/styles.xml rename to product/modules/mobileservices/agents/android/client/res/values-v11/styles.xml diff --git a/product/modules/agents/android/client/res/values-v14/styles.xml b/product/modules/mobileservices/agents/android/client/res/values-v14/styles.xml similarity index 100% rename from product/modules/agents/android/client/res/values-v14/styles.xml rename to product/modules/mobileservices/agents/android/client/res/values-v14/styles.xml diff --git a/product/modules/agents/android/client/res/values/colors.xml b/product/modules/mobileservices/agents/android/client/res/values/colors.xml similarity index 100% rename from product/modules/agents/android/client/res/values/colors.xml rename to product/modules/mobileservices/agents/android/client/res/values/colors.xml diff --git a/product/modules/agents/android/client/res/values/dimens.xml b/product/modules/mobileservices/agents/android/client/res/values/dimens.xml similarity index 100% rename from product/modules/agents/android/client/res/values/dimens.xml rename to product/modules/mobileservices/agents/android/client/res/values/dimens.xml diff --git a/product/modules/agents/android/client/res/values/ids.xml b/product/modules/mobileservices/agents/android/client/res/values/ids.xml similarity index 100% rename from product/modules/agents/android/client/res/values/ids.xml rename to product/modules/mobileservices/agents/android/client/res/values/ids.xml diff --git a/product/modules/agents/android/client/res/values/strings.xml b/product/modules/mobileservices/agents/android/client/res/values/strings.xml similarity index 100% rename from product/modules/agents/android/client/res/values/strings.xml rename to product/modules/mobileservices/agents/android/client/res/values/strings.xml diff --git a/product/modules/agents/android/client/res/values/styles.xml b/product/modules/mobileservices/agents/android/client/res/values/styles.xml similarity index 100% rename from product/modules/agents/android/client/res/values/styles.xml rename to product/modules/mobileservices/agents/android/client/res/values/styles.xml diff --git a/product/modules/agents/android/client/res/xml/wso2_device_admin.xml b/product/modules/mobileservices/agents/android/client/res/xml/wso2_device_admin.xml similarity index 100% rename from product/modules/agents/android/client/res/xml/wso2_device_admin.xml rename to product/modules/mobileservices/agents/android/client/res/xml/wso2_device_admin.xml diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/AlertActivity.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/AlertActivity.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/AlertActivity.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/AlertActivity.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/AlreadyRegisteredActivity.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/AlreadyRegisteredActivity.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/AlreadyRegisteredActivity.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/AlreadyRegisteredActivity.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/AuthenticationActivity.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/AuthenticationActivity.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/AuthenticationActivity.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/AuthenticationActivity.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/AuthenticationErrorActivity.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/AuthenticationErrorActivity.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/AuthenticationErrorActivity.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/AuthenticationErrorActivity.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/DisplayDeviceInfoActivity.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/DisplayDeviceInfoActivity.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/DisplayDeviceInfoActivity.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/DisplayDeviceInfoActivity.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/GCMIntentService.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/GCMIntentService.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/GCMIntentService.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/GCMIntentService.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/LogActivity.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/LogActivity.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/LogActivity.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/LogActivity.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/NotifyActivity.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/NotifyActivity.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/NotifyActivity.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/NotifyActivity.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/PinCodeActivity.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/PinCodeActivity.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/PinCodeActivity.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/PinCodeActivity.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/RegistrationActivity.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/RegistrationActivity.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/RegistrationActivity.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/RegistrationActivity.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/ServerDetails.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/ServerDetails.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/ServerDetails.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/ServerDetails.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/api/ApplicationManager.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/ApplicationManager.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/api/ApplicationManager.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/ApplicationManager.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/api/Battery.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/Battery.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/api/Battery.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/Battery.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/api/DeviceInfo.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/DeviceInfo.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/api/DeviceInfo.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/DeviceInfo.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/api/ExecShell.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/ExecShell.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/api/ExecShell.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/ExecShell.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/api/GPSTracker.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/GPSTracker.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/api/GPSTracker.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/GPSTracker.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/api/LocationServices.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/LocationServices.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/api/LocationServices.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/LocationServices.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/api/PhoneState.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/PhoneState.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/api/PhoneState.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/PhoneState.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/api/Root.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/Root.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/api/Root.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/Root.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/api/TrackCallSMS.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/TrackCallSMS.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/api/TrackCallSMS.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/TrackCallSMS.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/api/TrafficRecord.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/TrafficRecord.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/api/TrafficRecord.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/TrafficRecord.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/api/TrafficSnapshot.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/TrafficSnapshot.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/api/TrafficSnapshot.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/TrafficSnapshot.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/api/WiFiConfig.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/WiFiConfig.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/api/WiFiConfig.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/api/WiFiConfig.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/models/PInfo.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/models/PInfo.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/models/PInfo.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/models/PInfo.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/parser/PayloadParser.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/parser/PayloadParser.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/parser/PayloadParser.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/parser/PayloadParser.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/APIAccessCallBack.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/APIAccessCallBack.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/APIAccessCallBack.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/APIAccessCallBack.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/APIController.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/APIController.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/APIController.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/APIController.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/APIResultCallBack.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/APIResultCallBack.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/APIResultCallBack.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/APIResultCallBack.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/APIUtilities.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/APIUtilities.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/APIUtilities.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/APIUtilities.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/AccessTokenHandler.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/AccessTokenHandler.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/AccessTokenHandler.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/AccessTokenHandler.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/CallBack.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/CallBack.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/CallBack.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/CallBack.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/IdentityProxy.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/IdentityProxy.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/IdentityProxy.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/IdentityProxy.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/RefreshTokenHandler.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/RefreshTokenHandler.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/RefreshTokenHandler.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/RefreshTokenHandler.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/ServerUtilities.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/ServerUtilities.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/ServerUtilities.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/ServerUtilities.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/ServerUtilitiesTemp.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/ServerUtilitiesTemp.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/ServerUtilitiesTemp.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/ServerUtilitiesTemp.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/Token.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/Token.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/Token.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/Token.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/TokenCallBack.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/TokenCallBack.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/TokenCallBack.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/proxy/TokenCallBack.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/security/APIResultCallBackImpl.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/security/APIResultCallBackImpl.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/security/APIResultCallBackImpl.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/security/APIResultCallBackImpl.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/AlarmReceiver.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/AlarmReceiver.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/services/AlarmReceiver.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/AlarmReceiver.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/Config.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/Config.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/services/Config.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/Config.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/DeviceStartupIntentReceiver.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/DeviceStartupIntentReceiver.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/services/DeviceStartupIntentReceiver.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/DeviceStartupIntentReceiver.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/LocalNotification.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/LocalNotification.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/services/LocalNotification.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/LocalNotification.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/Operation.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/Operation.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/services/Operation.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/Operation.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/PolicyTester.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/PolicyTester.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/services/PolicyTester.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/PolicyTester.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/ProcessMessage.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/ProcessMessage.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/services/ProcessMessage.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/ProcessMessage.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/SMSReceiver.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/SMSReceiver.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/services/SMSReceiver.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/SMSReceiver.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/WSO2DeviceAdminReceiver.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/WSO2DeviceAdminReceiver.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/services/WSO2DeviceAdminReceiver.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/services/WSO2DeviceAdminReceiver.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/CommonDialogUtils.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/CommonDialogUtils.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/CommonDialogUtils.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/CommonDialogUtils.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/CommonUtilities.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/CommonUtilities.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/CommonUtilities.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/CommonUtilities.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/HTTPConnectorUtils.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/HTTPConnectorUtils.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/HTTPConnectorUtils.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/HTTPConnectorUtils.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/LoggerCustom.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/LoggerCustom.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/LoggerCustom.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/LoggerCustom.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/Preference.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/Preference.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/Preference.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/Preference.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/Responce.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/Responce.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/Responce.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/Responce.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/ServerUtils.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/ServerUtils.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/ServerUtils.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/ServerUtils.java diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/WSO2SSLSocketFactory.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/WSO2SSLSocketFactory.java similarity index 100% rename from product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/WSO2SSLSocketFactory.java rename to product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/utils/WSO2SSLSocketFactory.java diff --git a/product/modules/agents/android/jax-rs/build.xml b/product/modules/mobileservices/agents/android/jax-rs/build.xml similarity index 100% rename from product/modules/agents/android/jax-rs/build.xml rename to product/modules/mobileservices/agents/android/jax-rs/build.xml diff --git a/product/modules/agents/android/jax-rs/pom.xml b/product/modules/mobileservices/agents/android/jax-rs/pom.xml similarity index 100% rename from product/modules/agents/android/jax-rs/pom.xml rename to product/modules/mobileservices/agents/android/jax-rs/pom.xml diff --git a/product/modules/agents/android/jax-rs/run-client.bat b/product/modules/mobileservices/agents/android/jax-rs/run-client.bat similarity index 100% rename from product/modules/agents/android/jax-rs/run-client.bat rename to product/modules/mobileservices/agents/android/jax-rs/run-client.bat diff --git a/product/modules/agents/android/jax-rs/run-client.sh b/product/modules/mobileservices/agents/android/jax-rs/run-client.sh similarity index 100% rename from product/modules/agents/android/jax-rs/run-client.sh rename to product/modules/mobileservices/agents/android/jax-rs/run-client.sh diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Device.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Device.java similarity index 70% rename from product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Device.java rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Device.java index 19a67b99599..cd1451fff7c 100644 --- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Device.java +++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Device.java @@ -16,7 +16,7 @@ * under the License. */ //org.wso2.carbon.... -package cdm.api.android; +package org.wso2.cdmserver.mobileservices.android; import cdm.api.android.common.AndroidAgentException; import cdm.api.android.util.AndroidAPIUtils; @@ -28,119 +28,115 @@ import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.common.DeviceManagementServiceException; -import org.wso2.carbon.device.mgt.core.service.DeviceManagementService; import javax.ws.rs.*; import javax.ws.rs.core.Response; import java.util.List; /** * Android Device Management REST-API implementation. + * All end points supports JSON, XMl with content negotiation. */ @Produces({ "application/json", "application/xml" }) @Consumes({ "application/json", "application/xml" }) public class Device { - private static Log LOG = LogFactory.getLog(Device.class); + private static Log log = LogFactory.getLog(Device.class); + /** + * Get all devices.Returns list of devices registered in the CDM. + * @return Device List + * @throws AndroidAgentException + */ @GET public List getAllDevices() throws AndroidAgentException { List devices; - String msg; - DeviceManagementService dmService; try { - dmService = AndroidAPIUtils.getDeviceManagementService(); - + devices = AndroidAPIUtils.getDeviceManagementService().getAllDevices( + DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID); + return devices; } catch (DeviceManagementServiceException deviceMgtServiceEx) { String errorMsg = "Device management service error"; - LOG.error(errorMsg, deviceMgtServiceEx); + log.error(errorMsg, deviceMgtServiceEx); throw new AndroidAgentException(errorMsg, deviceMgtServiceEx); - } - - try { - devices = dmService.getAllDevices(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID); - Response.status(HttpStatus.SC_OK); - return devices; - } catch (DeviceManagementException e) { - msg = "Error occurred while fetching the device list."; - LOG.error(msg, e); - throw new AndroidAgentException(msg, e); + String errorMsg = "Error occurred while fetching the device list."; + log.error(errorMsg, e); + throw new AndroidAgentException(errorMsg, e); } } + /** + * Fetch device details of given device Id. + * @param id Device Id + * @return Device + * @throws AndroidAgentException + */ @GET @Path("{id}") public org.wso2.carbon.device.mgt.common.Device getDevice(@PathParam("id") String id) throws AndroidAgentException { String msg; - DeviceManagementService dmService; org.wso2.carbon.device.mgt.common.Device device; try { - dmService = AndroidAPIUtils.getDeviceManagementService(); - } catch (DeviceManagementServiceException deviceMgtServiceEx) { - String errorMsg = "Device management service error"; - LOG.error(errorMsg, deviceMgtServiceEx); - throw new AndroidAgentException(errorMsg, deviceMgtServiceEx); - } - - DeviceIdentifier deviceIdentifier = AndroidAPIUtils.convertToDeviceIdentifierObject(id); - try { - device = dmService.getDevice(deviceIdentifier); + DeviceIdentifier deviceIdentifier = AndroidAPIUtils.convertToDeviceIdentifierObject(id); + device = AndroidAPIUtils.getDeviceManagementService().getDevice(deviceIdentifier); if (device == null) { Response.status(HttpStatus.SC_NOT_FOUND); } return device; + } catch (DeviceManagementServiceException deviceMgtServiceEx) { + String errorMsg = "Device management service error"; + log.error(errorMsg, deviceMgtServiceEx); + throw new AndroidAgentException(errorMsg, deviceMgtServiceEx); } catch (DeviceManagementException deviceMgtEx) { msg = "Error occurred while fetching the device information."; - LOG.error(msg, deviceMgtEx); + log.error(msg, deviceMgtEx); throw new AndroidAgentException(msg, deviceMgtEx); } } + /** + * Update device details of given device id. + * @param id Device Id + * @param device Device Details + * @return Message + * @throws AndroidAgentException + */ @PUT @Path("{id}") public Message updateDevice(@PathParam("id") String id, org.wso2.carbon.device.mgt.common.Device device) throws AndroidAgentException { - DeviceManagementService dmService = null; Message responseMessage = new Message(); - boolean result; - - try { - dmService = AndroidAPIUtils.getDeviceManagementService(); - - } catch (DeviceManagementServiceException deviceManagementServiceException) { - String errorMsg = "Device management service error"; - LOG.error(errorMsg, deviceManagementServiceException); - } - try { device.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID); - result = dmService.updateDeviceInfo(device); - + result = AndroidAPIUtils.getDeviceManagementService().updateDeviceInfo(device); if (result) { - Response.status(HttpStatus.SC_OK); + Response.status(HttpStatus.SC_ACCEPTED); responseMessage.setResponseMessage("Device information has modified successfully."); } else { Response.status(HttpStatus.SC_NOT_MODIFIED); responseMessage.setResponseMessage("Device not found for the update."); } return responseMessage; - + } catch (DeviceManagementServiceException deviceManagementServiceException) { + String errorMsg = "Device management service error"; + log.error(errorMsg, deviceManagementServiceException); + throw new AndroidAgentException(errorMsg, deviceManagementServiceException); } catch (DeviceManagementException deviceMgtEx) { String msg = "Error occurred while modifying the device information."; - LOG.error(msg, deviceMgtEx); + log.error(msg, deviceMgtEx); throw new AndroidAgentException(msg, deviceMgtEx); } } @POST @Path("/device/license") - @Produces ("text/plain") + @Produces("text/plain") public String getLicense() { //TODO: need to implement fetch license from core return "License Agreement"; diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Enrollment.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Enrollment.java similarity index 86% rename from product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Enrollment.java rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Enrollment.java index 6a4e00079e7..0e337653acc 100644 --- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Enrollment.java +++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Enrollment.java @@ -16,7 +16,7 @@ * under the License. */ -package cdm.api.android; +package org.wso2.cdmserver.mobileservices.android; import cdm.api.android.common.AndroidAgentException; import cdm.api.android.util.AndroidAPIUtils; @@ -29,12 +29,12 @@ import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.common.DeviceManagementServiceException; import org.wso2.carbon.device.mgt.core.service.DeviceManagementService; - import javax.ws.rs.*; import javax.ws.rs.core.Response; /** * Android Device Enrollment REST-API implementation. + * All end points supports JSON, XMl with content negotiation. */ @Produces({ "application/json", "application/xml" }) @Consumes({ "application/json", "application/xml" }) @@ -45,25 +45,18 @@ public class Enrollment { @POST public Message enrollDevice(org.wso2.carbon.device.mgt.common.Device device) throws AndroidAgentException { - DeviceManagementService dmService; Message responseMsg = new Message(); - try { - dmService = AndroidAPIUtils.getDeviceManagementService(); - - } catch (DeviceManagementServiceException deviceServiceMgtEx) { - String errorMsg = "Device management service error"; - log.error(errorMsg, deviceServiceMgtEx); - throw new AndroidAgentException(errorMsg, deviceServiceMgtEx); - } - try { device.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID); - dmService.enrollDevice(device); + AndroidAPIUtils.getDeviceManagementService().enrollDevice(device); Response.status(HttpStatus.SC_CREATED); responseMsg.setResponseMessage("Device enrollment succeeded"); return responseMsg; - + } catch (DeviceManagementServiceException deviceServiceMgtEx) { + String errorMsg = "Device management service error"; + log.error(errorMsg, deviceServiceMgtEx); + throw new AndroidAgentException(errorMsg, deviceServiceMgtEx); } catch (DeviceManagementException deviceMgtEx) { String errorMsg = "Error occurred while enrolling the device"; log.error(errorMsg, deviceMgtEx); @@ -76,22 +69,10 @@ public class Enrollment { public Message isEnrolled(@PathParam("id") String id) throws AndroidAgentException { boolean result; - DeviceManagementService dmService; Message responseMsg = new Message(); - - try { - dmService = AndroidAPIUtils.getDeviceManagementService(); - - } catch (DeviceManagementServiceException deviceServiceMgtEx) { - String errorMsg = "Device management service error"; - log.error(errorMsg, deviceServiceMgtEx); - throw new AndroidAgentException(errorMsg, deviceServiceMgtEx); - } - DeviceIdentifier deviceIdentifier = AndroidAPIUtils.convertToDeviceIdentifierObject(id); - try { - result = dmService.isEnrolled(deviceIdentifier); + result = AndroidAPIUtils.getDeviceManagementService().isEnrolled(deviceIdentifier); if (result) { Response.status(HttpStatus.SC_OK); responseMsg.setResponseMessage("Device has already enrolled"); @@ -100,6 +81,10 @@ public class Enrollment { responseMsg.setResponseMessage("Device not found"); } return responseMsg; + } catch (DeviceManagementServiceException deviceServiceMgtEx) { + String errorMsg = "Device management service error"; + log.error(errorMsg, deviceServiceMgtEx); + throw new AndroidAgentException(errorMsg, deviceServiceMgtEx); } catch (DeviceManagementException deviceMgtEx) { String errorMsg = "Error occurred while enrollment of the device."; log.error(errorMsg, deviceMgtEx); @@ -113,39 +98,29 @@ public class Enrollment { throws AndroidAgentException { boolean result; - DeviceManagementService dmService; Message responseMsg = new Message(); - try { - dmService = AndroidAPIUtils.getDeviceManagementService(); - - } catch (DeviceManagementServiceException deviceServiceMgtEx) { - String errorMsg = "Device management service error"; - log.error(errorMsg, deviceServiceMgtEx); - throw new AndroidAgentException(errorMsg, deviceServiceMgtEx); - } - try { device.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID); - result = dmService.modifyEnrollment(device); - + result = AndroidAPIUtils.getDeviceManagementService().modifyEnrollment(device); if (result) { responseMsg.setResponseMessage("Device enrollment has updated successfully"); - Response.status(HttpStatus.SC_OK); + Response.status(HttpStatus.SC_ACCEPTED); } else { - responseMsg.setResponseMessage("device not found for enrollment"); + responseMsg.setResponseMessage("Device not found for enrollment"); Response.status(HttpStatus.SC_NOT_MODIFIED); } - return responseMsg; - + } catch (DeviceManagementServiceException deviceServiceMgtEx) { + String errorMsg = "Device management service error"; + log.error(errorMsg, deviceServiceMgtEx); + throw new AndroidAgentException(errorMsg, deviceServiceMgtEx); } catch (DeviceManagementException deviceMgtEx) { String errorMsg = "Error occurred while modifying enrollment of the device"; log.error(errorMsg, deviceMgtEx); throw new AndroidAgentException(errorMsg, deviceMgtEx); } - - } + } @DELETE @Path("{id}") @@ -155,28 +130,22 @@ public class Enrollment { Message responseMsg = new Message(); boolean result; - - try { - dmService = AndroidAPIUtils.getDeviceManagementService(); - - } catch (DeviceManagementServiceException deviceServiceMgtEx) { - String errorMsg = "Device management service error"; - log.error(errorMsg, deviceServiceMgtEx); - throw new AndroidAgentException(errorMsg, deviceServiceMgtEx); - } DeviceIdentifier deviceIdentifier = AndroidAPIUtils.convertToDeviceIdentifierObject(id); try { - result = dmService.disenrollDevice(deviceIdentifier); + result = AndroidAPIUtils.getDeviceManagementService().disenrollDevice(deviceIdentifier); if (result) { - responseMsg.setResponseMessage("Device has disenrolled successfully"); + responseMsg.setResponseMessage("Device has removed successfully"); Response.status(HttpStatus.SC_OK); } else { responseMsg.setResponseMessage("Device not found"); Response.status(HttpStatus.SC_NOT_FOUND); } return responseMsg; - + } catch (DeviceManagementServiceException deviceServiceMgtEx) { + String errorMsg = "Device management service error"; + log.error(errorMsg, deviceServiceMgtEx); + throw new AndroidAgentException(errorMsg, deviceServiceMgtEx); } catch (DeviceManagementException deviceMgtEx) { String errorMsg = "Error occurred while dis enrolling the device"; log.error(errorMsg, deviceMgtEx); diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Test.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Test.java similarity index 94% rename from product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Test.java rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Test.java index caf7cf5382b..689537e135d 100644 --- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Test.java +++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Test.java @@ -1,4 +1,4 @@ -package cdm.api.android; +package org.wso2.cdmserver.mobileservices.android; import org.wso2.carbon.device.mgt.common.*; import org.wso2.carbon.device.mgt.common.Device; diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/common/AndroidAgentException.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/AndroidAgentException.java similarity index 96% rename from product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/common/AndroidAgentException.java rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/AndroidAgentException.java index 138a3fa952f..ed5bf67369d 100644 --- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/common/AndroidAgentException.java +++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/AndroidAgentException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package cdm.api.android.common; +package org.wso2.cdmserver.mobileservices.android.common; public class AndroidAgentException extends Exception{ diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/common/ErrorHandler.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/ErrorHandler.java similarity index 92% rename from product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/common/ErrorHandler.java rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/ErrorHandler.java index de3d0c523ff..a15316026ac 100644 --- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/common/ErrorHandler.java +++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/ErrorHandler.java @@ -15,9 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package cdm.api.android.common; - -import org.wso2.carbon.device.mgt.common.DeviceManagementException; +package org.wso2.cdmserver.mobileservices.android.common; import javax.ws.rs.Produces; import javax.ws.rs.core.Response; diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/common/ErrorMessage.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/ErrorMessage.java similarity index 95% rename from product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/common/ErrorMessage.java rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/ErrorMessage.java index d166f105d4b..171b708e341 100644 --- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/common/ErrorMessage.java +++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/ErrorMessage.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package cdm.api.android.common; +package org.wso2.cdmserver.mobileservices.android.common; public class ErrorMessage { diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidAPIUtils.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.java similarity index 94% rename from product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidAPIUtils.java rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.java index c7717041009..2cc0793aecf 100644 --- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidAPIUtils.java +++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cdm.api.android.util; +package org.wso2.cdmserver.mobileservices.android.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -50,7 +50,7 @@ public class AndroidAPIUtils { dmService = (DeviceManagementService) ctx.getOSGiService(DeviceManagementService.class, null); if (dmService == null){ - log.error("device management service not initialized"); + log.error("Device management service not initialized"); throw new DeviceManagementServiceException("device management service not initialized"); } PrivilegedCarbonContext.endTenantFlow(); diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidConstants.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidConstants.java similarity index 96% rename from product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidConstants.java rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidConstants.java index 0dcb9e59de6..46ea199b8eb 100644 --- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidConstants.java +++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package cdm.api.android.util; +package org.wso2.cdmserver.mobileservices.android.util; /** * Defines constants used in Android-REST API bundle. diff --git a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/Message.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/Message.java similarity index 95% rename from product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/Message.java rename to product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/Message.java index f5e34cf7ec4..35de2cb3104 100644 --- a/product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/Message.java +++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/Message.java @@ -16,7 +16,7 @@ * under the License. */ -package cdm.api.android.util; +package org.wso2.cdmserver.mobileservices.android.util; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -36,7 +36,6 @@ public class Message { this.responseMessage = responseMessage; } - @XmlElement public String getResponseCode() { return responseCode; diff --git a/product/modules/agents/android/jax-rs/src/main/webapp/META-INF/webapp-classloading.xml b/product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from product/modules/agents/android/jax-rs/src/main/webapp/META-INF/webapp-classloading.xml rename to product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/product/modules/agents/android/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml b/product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 100% rename from product/modules/agents/android/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml rename to product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml diff --git a/product/modules/agents/android/jax-rs/src/main/webapp/WEB-INF/web.xml b/product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from product/modules/agents/android/jax-rs/src/main/webapp/WEB-INF/web.xml rename to product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/WEB-INF/web.xml diff --git a/product/modules/agents/android/jax-rs/src/main/webapp/servicelist.css b/product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/servicelist.css similarity index 100% rename from product/modules/agents/android/jax-rs/src/main/webapp/servicelist.css rename to product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/servicelist.css diff --git a/product/modules/agents/windows/jax-rs/build.xml b/product/modules/mobileservices/agents/windows/jax-rs/build.xml similarity index 100% rename from product/modules/agents/windows/jax-rs/build.xml rename to product/modules/mobileservices/agents/windows/jax-rs/build.xml diff --git a/product/modules/agents/windows/jax-rs/pom.xml b/product/modules/mobileservices/agents/windows/jax-rs/pom.xml similarity index 100% rename from product/modules/agents/windows/jax-rs/pom.xml rename to product/modules/mobileservices/agents/windows/jax-rs/pom.xml diff --git a/product/modules/agents/windows/jax-rs/run-client.bat b/product/modules/mobileservices/agents/windows/jax-rs/run-client.bat similarity index 100% rename from product/modules/agents/windows/jax-rs/run-client.bat rename to product/modules/mobileservices/agents/windows/jax-rs/run-client.bat diff --git a/product/modules/agents/windows/jax-rs/run-client.sh b/product/modules/mobileservices/agents/windows/jax-rs/run-client.sh similarity index 100% rename from product/modules/agents/windows/jax-rs/run-client.sh rename to product/modules/mobileservices/agents/windows/jax-rs/run-client.sh diff --git a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/DiscoveryService.java b/product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/DiscoveryService.java similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/DiscoveryService.java rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/DiscoveryService.java diff --git a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/EnrolmentService.java b/product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/EnrolmentService.java similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/EnrolmentService.java rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/EnrolmentService.java diff --git a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/DiscoveryServiceImpl.java b/product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/DiscoveryServiceImpl.java similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/DiscoveryServiceImpl.java rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/DiscoveryServiceImpl.java diff --git a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/EnrolmentServiceImpl.java b/product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/EnrolmentServiceImpl.java similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/EnrolmentServiceImpl.java rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/EnrolmentServiceImpl.java diff --git a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/CertificateSigningService.java b/product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/CertificateSigningService.java similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/CertificateSigningService.java rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/CertificateSigningService.java diff --git a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/WindowsAPIUtil.java b/product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/WindowsAPIUtil.java similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/WindowsAPIUtil.java rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/WindowsAPIUtil.java diff --git a/product/modules/agents/windows/jax-rs/src/main/resources/applicationContext.xml b/product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/applicationContext.xml similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/resources/applicationContext.xml rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/applicationContext.xml diff --git a/product/modules/agents/windows/jax-rs/src/main/resources/ca_cert.pem b/product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/ca_cert.pem similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/resources/ca_cert.pem rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/ca_cert.pem diff --git a/product/modules/agents/windows/jax-rs/src/main/resources/ca_private.key b/product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/ca_private.key similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/resources/ca_private.key rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/ca_private.key diff --git a/product/modules/agents/windows/jax-rs/src/main/resources/discover-service.xml b/product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/discover-service.xml similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/resources/discover-service.xml rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/discover-service.xml diff --git a/product/modules/agents/windows/jax-rs/src/main/resources/enrollment-service.xml b/product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/enrollment-service.xml similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/resources/enrollment-service.xml rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/enrollment-service.xml diff --git a/product/modules/agents/windows/jax-rs/src/main/resources/log4j.xml b/product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/log4j.xml similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/resources/log4j.xml rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/log4j.xml diff --git a/product/modules/agents/windows/jax-rs/src/main/resources/policy-service.xml b/product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/policy-service.xml similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/resources/policy-service.xml rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/policy-service.xml diff --git a/product/modules/agents/windows/jax-rs/src/main/resources/wap-provisioning.xml b/product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/wap-provisioning.xml similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/resources/wap-provisioning.xml rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/wap-provisioning.xml diff --git a/product/modules/agents/windows/jax-rs/src/main/resources/windows-mdm-server.properties b/product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/windows-mdm-server.properties similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/resources/windows-mdm-server.properties rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/windows-mdm-server.properties diff --git a/product/modules/agents/windows/jax-rs/src/main/webapp/META-INF/webapp-classloading.xml b/product/modules/mobileservices/agents/windows/jax-rs/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/webapp/META-INF/webapp-classloading.xml rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/product/modules/agents/windows/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml b/product/modules/mobileservices/agents/windows/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml diff --git a/product/modules/agents/windows/jax-rs/src/main/webapp/WEB-INF/web.xml b/product/modules/mobileservices/agents/windows/jax-rs/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/webapp/WEB-INF/web.xml rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/webapp/WEB-INF/web.xml diff --git a/product/modules/agents/windows/jax-rs/src/main/webapp/servicelist.css b/product/modules/mobileservices/agents/windows/jax-rs/src/main/webapp/servicelist.css similarity index 100% rename from product/modules/agents/windows/jax-rs/src/main/webapp/servicelist.css rename to product/modules/mobileservices/agents/windows/jax-rs/src/main/webapp/servicelist.css