From 14a271f8d9d95078d4ff105865bab43c1ac1d446 Mon Sep 17 00:00:00 2001
From: kenstir <kenstir@gmail.com>
Date: Sat, 28 Dec 2013 17:49:56 -0500
Subject: [PATCH] Global rename of misnamed org.evergreen.android ->
 org.evergreen_ils evergreen.org is a church, evergreen-ils.org is library
 software

---
 Open-ILS/src/Android/README                        | 18 +++++-----
 Open-ILS/src/Android/core/AndroidManifest.xml      | 40 +++++++++++-----------
 .../src/Android/core/res/layout/barcode_scan.xml   |  2 +-
 .../Android/core/res/layout/simple_underlines.xml  |  2 +-
 .../accountAccess/AccountAccess.java               | 18 +++++-----
 .../accountAccess/MaxRenewalsException.java        |  2 +-
 .../accountAccess/ServerErrorMessage.java          |  2 +-
 .../accountAccess/SessionNotFoundException.java    |  2 +-
 .../accountAccess/bookbags/BookBag.java            |  2 +-
 .../accountAccess/bookbags/BookBagDetails.java     | 18 +++++-----
 .../accountAccess/bookbags/BookBagItem.java        |  4 +--
 .../accountAccess/bookbags/BookbagsListView.java   | 14 ++++----
 .../accountAccess/checkout/CircRecord.java         |  4 +--
 .../checkout/ItemsCheckOutListView.java            | 18 +++++-----
 .../accountAccess/fines/FinesActivity.java         | 14 ++++----
 .../accountAccess/fines/FinesRecord.java           |  4 +--
 .../accountAccess/holds/HoldDetails.java           | 16 ++++-----
 .../accountAccess/holds/HoldRecord.java            |  8 ++---
 .../accountAccess/holds/HoldsListView.java         | 19 +++++-----
 .../accountAccess/holds/PlaceHold.java             | 18 +++++-----
 .../evergreen_ils/auth/AuthenticatorActivity.java  |  2 +-
 .../evergreen_ils/auth/EvergreenAuthenticator.java |  2 +-
 .../barcodescan/CaptureActivity.java               |  8 ++---
 .../barcodescan/CaptureActivityHandler.java        |  6 ++--
 .../barcodescan/DecodeFormatManager.java           |  2 +-
 .../barcodescan/DecodeHandler.java                 |  6 ++--
 .../barcodescan/DecodeThread.java                  |  4 +--
 .../barcodescan/FinishListener.java                |  2 +-
 .../barcodescan/Functions.java                     |  2 +-
 .../barcodescan/Intents.java                       |  2 +-
 .../barcodescan/PlanarYUVLuminanceSource.java      |  2 +-
 .../barcodescan/PreferencesActivity.java           |  2 +-
 .../barcodescan/ViewfinderResultPointCallback.java |  2 +-
 .../barcodescan/ViewfinderView.java                |  6 ++--
 .../barcodescan/camera/AutoFocusCallback.java      |  2 +-
 .../camera/CameraConfigurationManager.java         |  4 +--
 .../barcodescan/camera/CameraManager.java          |  6 ++--
 .../barcodescan/camera/FlashlightManager.java      |  2 +-
 .../barcodescan/camera/PreviewCallback.java        |  2 +-
 .../barcodescan/result/ResultHandler.java          |  2 +-
 .../database/DatabaseManager.java                  |  4 +--
 .../globals/EvergreenConstants.java                |  2 +-
 .../globals/GlobalConfigs.java                     | 10 +++---
 .../globals/ShowServerNotAvailableRunnable.java    |  2 +-
 .../globals/ShowSessionNotAvailableRunnable.java   |  2 +-
 .../android => evergreen_ils}/globals/Utils.java   |  4 +--
 .../searchCatalog/AdvancedSearchActivity.java      | 10 +++---
 .../searchCatalog/CopyCountInformation.java        |  2 +-
 .../searchCatalog/CopyInformation.java             |  2 +-
 .../searchCatalog/ImageDownloader.java             |  4 +--
 .../searchCatalog/MoreCopyInformation.java         | 10 +++---
 .../searchCatalog/Organisation.java                |  2 +-
 .../searchCatalog/RecordInfo.java                  |  2 +-
 .../searchCatalog/SampleUnderlinesNoFade.java      | 16 ++++-----
 .../searchCatalog/SearchCatalog.java               |  6 ++--
 .../searchCatalog/SearchCatalogListView.java       | 24 ++++++-------
 .../services/NotificationAlert.java                |  2 +-
 .../services/NotificationReceiver.java             |  4 +--
 .../services/PeriodicServiceBroadcastReceiver.java |  2 +-
 .../services/RebootReceiver.java                   |  2 +-
 .../services/ScheduledIntentService.java           | 14 ++++----
 .../utils/ui/BaseSampleActivity.java               |  4 +--
 .../utils/ui/BasicDetailsFragment.java             | 24 ++++++-------
 .../utils/ui/Dashboard.java                        |  2 +-
 .../utils/ui/PageIndicator.java                    |  2 +-
 .../utils/ui/TabPageIndicator.java                 |  4 +--
 .../utils/ui/TestFragment.java                     |  2 +-
 .../utils/ui/TestFragmentAdapter.java              |  2 +-
 .../utils/ui/TitlePageIndicator.java               |  4 +--
 .../utils/ui/UnderlinePageIndicator.java           |  4 +--
 .../views/AccountScreenDashboard.java              | 18 +++++-----
 .../views/ApplicationPreferences.java              | 12 +++----
 .../views/splashscreen/LoadingTask.java            | 10 +++---
 .../views/splashscreen/SplashActivity.java         | 12 +++----
 .../src/Android/cwmars_app/AndroidManifest.xml     | 38 ++++++++++----------
 Open-ILS/src/Android/demo_app/AndroidManifest.xml  | 38 ++++++++++----------
 76 files changed, 297 insertions(+), 296 deletions(-)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/AccountAccess.java (98%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/MaxRenewalsException.java (95%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/ServerErrorMessage.java (95%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/SessionNotFoundException.java (95%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/bookbags/BookBag.java (96%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/bookbags/BookBagDetails.java (95%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/bookbags/BookBagItem.java (91%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/bookbags/BookbagsListView.java (96%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/checkout/CircRecord.java (97%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/checkout/ItemsCheckOutListView.java (96%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/fines/FinesActivity.java (95%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/fines/FinesRecord.java (95%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/holds/HoldDetails.java (97%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/holds/HoldRecord.java (95%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/holds/HoldsListView.java (94%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/accountAccess/holds/PlaceHold.java (96%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/CaptureActivity.java (96%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/CaptureActivityHandler.java (96%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/DecodeFormatManager.java (98%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/DecodeHandler.java (96%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/DecodeThread.java (96%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/FinishListener.java (96%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/Functions.java (91%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/Intents.java (99%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/PlanarYUVLuminanceSource.java (99%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/PreferencesActivity.java (98%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/ViewfinderResultPointCallback.java (96%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/ViewfinderView.java (98%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/camera/AutoFocusCallback.java (97%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/camera/CameraConfigurationManager.java (98%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/camera/CameraManager.java (98%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/camera/FlashlightManager.java (98%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/camera/PreviewCallback.java (97%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/barcodescan/result/ResultHandler.java (97%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/database/DatabaseManager.java (97%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/globals/EvergreenConstants.java (99%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/globals/GlobalConfigs.java (97%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/globals/ShowServerNotAvailableRunnable.java (97%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/globals/ShowSessionNotAvailableRunnable.java (97%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/globals/Utils.java (99%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/searchCatalog/AdvancedSearchActivity.java (96%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/searchCatalog/CopyCountInformation.java (97%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/searchCatalog/CopyInformation.java (98%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/searchCatalog/ImageDownloader.java (99%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/searchCatalog/MoreCopyInformation.java (95%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/searchCatalog/Organisation.java (96%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/searchCatalog/RecordInfo.java (99%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/searchCatalog/SampleUnderlinesNoFade.java (93%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/searchCatalog/SearchCatalog.java (98%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/searchCatalog/SearchCatalogListView.java (97%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/services/NotificationAlert.java (97%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/services/NotificationReceiver.java (96%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/services/PeriodicServiceBroadcastReceiver.java (98%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/services/RebootReceiver.java (98%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/services/ScheduledIntentService.java (95%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/utils/ui/BaseSampleActivity.java (96%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/utils/ui/BasicDetailsFragment.java (95%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/utils/ui/Dashboard.java (99%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/utils/ui/PageIndicator.java (98%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/utils/ui/TabPageIndicator.java (99%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/utils/ui/TestFragment.java (95%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/utils/ui/TestFragmentAdapter.java (94%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/utils/ui/TitlePageIndicator.java (99%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/utils/ui/UnderlinePageIndicator.java (99%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/views/AccountScreenDashboard.java (92%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/views/ApplicationPreferences.java (94%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/views/splashscreen/LoadingTask.java (95%)
 rename Open-ILS/src/Android/core/src/org/{evergreen/android => evergreen_ils}/views/splashscreen/SplashActivity.java (93%)

diff --git a/Open-ILS/src/Android/README b/Open-ILS/src/Android/README
index 213533a875..616b7a0d1c 100644
--- a/Open-ILS/src/Android/README
+++ b/Open-ILS/src/Android/README
@@ -19,9 +19,9 @@ Project relies on the following libraries :
 2.Project structure :
 ===================================================================
 
-Packages are under the root package org.evergreen.android :
+Packages are under the root package org.evergreen_ils :
    
-    - org.evergreen.android.accountAccess:
+    - org.evergreen_ils.accountAccess:
             accountAccess.holds
             accountAccess.fines
             accountAccess.bookbags
@@ -29,31 +29,31 @@ Packages are under the root package org.evergreen.android :
 
 	This package handles the my account administration panel. In every subpackage the classes for the specific category are placed inside it.
 
-	- org.evergreen.android.barcodescan:
+	- org.evergreen_ils.barcodescan:
 
 	This package represents the barcode scan part of the project. It has a camera AR view class which helps scan the barcode. The class is limited for scanning 1D barcodes like UPC and EAN type barcodes.
 
-	- org.evergreen.android.database
+	- org.evergreen_ils.database
 
 	This package contains the Database Manager class that is used to persist classes into SQLite memory.
 
-	- org.evergreen.android.globals
+	- org.evergreen_ils.globals
 
 	This package contains global configuration classes and utils methods and functions used within the project
 
-	- org.evergreen.android.searchCatalog
+	- org.evergreen_ils.searchCatalog
 
 	This package is used for the search option of the application.
 
-	- org.evergreen.android.services
+	- org.evergreen_ils.services
 
 	This package contains background services and broadcast receivers used for settings notifications on items checkout expiration.
 
-	- org.evergreen.android.utils.ui
+	- org.evergreen_ils.utils.ui
 
 	Classes for fragment uses. Some of them are not used in the project but can become useful.
 
-	- org.evergreen.android.views
+	- org.evergreen_ils.views
 
 	Some global application views like the Splashscreen, ApplicationSettings, MyAccountDashboard or the ConfigureApplication view.
 
diff --git a/Open-ILS/src/Android/core/AndroidManifest.xml b/Open-ILS/src/Android/core/AndroidManifest.xml
index f6d03ff4c8..95a42e16a6 100644
--- a/Open-ILS/src/Android/core/AndroidManifest.xml
+++ b/Open-ILS/src/Android/core/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.evergreen.android"
+    package="org.evergreen_ils"
     android:installLocation="auto"
     android:versionCode="1"
     android:versionName="1.0" >
@@ -37,26 +37,26 @@
 
         <!-- Notification receiver -->
         <receiver
-            android:name="org.evergreen.android.services.NotificationReceiver"
+            android:name="org.evergreen_ils.services.NotificationReceiver"
             android:process=":remote" >
         </receiver>
         <!-- Receiver to reinit notifications on reboot -->
-        <receiver android:name="org.evergreen.android.services.RebootReceiver" >
+        <receiver android:name="org.evergreen_ils.services.RebootReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
-        <receiver android:name="org.evergreen.android.services.PeriodicServiceBroadcastReceiver" >
+        <receiver android:name="org.evergreen_ils.services.PeriodicServiceBroadcastReceiver" >
             <intent-filter>
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
             </intent-filter>
         </receiver>
 
-        <service android:name="org.evergreen.android.services.ScheduledIntentService" >
+        <service android:name="org.evergreen_ils.services.ScheduledIntentService" >
         </service>
 
         <activity
-            android:name="org.evergreen.android.views.splashscreen.SplashActivity"
+            android:name="org.evergreen_ils.views.splashscreen.SplashActivity"
             >
             <!--  android:theme="@android:style/Theme.Light.NoTitleBar"  -->
             <intent-filter>
@@ -66,49 +66,49 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="org.evergreen.android.views.AccountScreenDashboard"
+            android:name="org.evergreen_ils.views.AccountScreenDashboard"
             android:theme="@android:style/Theme.Light.NoTitleBar" >
         </activity>
-        <activity android:name="org.evergreen.android.views.ApplicationPreferences" >
+        <activity android:name="org.evergreen_ils.views.ApplicationPreferences" >
         </activity>
 
         <!-- Search -->
 
-        <activity android:name="org.evergreen.android.searchCatalog.SampleUnderlinesNoFade">
+        <activity android:name="org.evergreen_ils.searchCatalog.SampleUnderlinesNoFade">
         </activity>
-        <activity android:name="org.evergreen.android.searchCatalog.MoreCopyInformation" >
+        <activity android:name="org.evergreen_ils.searchCatalog.MoreCopyInformation" >
         </activity>
-        <activity android:name="org.evergreen.android.searchCatalog.SearchCatalogListView">
+        <activity android:name="org.evergreen_ils.searchCatalog.SearchCatalogListView">
         </activity>
-        <activity android:name="org.evergreen.android.searchCatalog.AdvancedSearchActivity" >
+        <activity android:name="org.evergreen_ils.searchCatalog.AdvancedSearchActivity" >
         </activity>
         <activity
-            android:name="org.evergreen.android.barcodescan.CaptureActivity"
+            android:name="org.evergreen_ils.barcodescan.CaptureActivity"
             android:screenOrientation="landscape"
             android:theme="@android:style/Theme.NoTitleBar"
             android:windowSoftInputMode="stateAlwaysHidden" >
         </activity>
 
         <!-- Checkout Activities -->
-        <activity android:name="org.evergreen.android.accountAccess.checkout.ItemsCheckOutListView" >
+        <activity android:name="org.evergreen_ils.accountAccess.checkout.ItemsCheckOutListView" >
         </activity>
 
         <!-- Holds Activities -->
-        <activity android:name="org.evergreen.android.accountAccess.holds.HoldsListView" >
+        <activity android:name="org.evergreen_ils.accountAccess.holds.HoldsListView" >
         </activity>
-        <activity android:name="org.evergreen.android.accountAccess.holds.PlaceHold" >
+        <activity android:name="org.evergreen_ils.accountAccess.holds.PlaceHold" >
         </activity>
-        <activity android:name="org.evergreen.android.accountAccess.holds.HoldDetails" >
+        <activity android:name="org.evergreen_ils.accountAccess.holds.HoldDetails" >
         </activity>
 
         <!-- Fines Activities -->
-        <activity android:name="org.evergreen.android.accountAccess.fines.FinesActivity" >
+        <activity android:name="org.evergreen_ils.accountAccess.fines.FinesActivity" >
         </activity>
 
         <!-- Bookbags -->
-        <activity android:name="org.evergreen.android.accountAccess.bookbags.BookbagsListView" >
+        <activity android:name="org.evergreen_ils.accountAccess.bookbags.BookbagsListView" >
         </activity>
-        <activity android:name="org.evergreen.android.accountAccess.bookbags.BookBagDetails" >
+        <activity android:name="org.evergreen_ils.accountAccess.bookbags.BookBagDetails" >
         </activity>
 
         <activity
diff --git a/Open-ILS/src/Android/core/res/layout/barcode_scan.xml b/Open-ILS/src/Android/core/res/layout/barcode_scan.xml
index ea1f8efbdb..a95bbd85c1 100755
--- a/Open-ILS/src/Android/core/res/layout/barcode_scan.xml
+++ b/Open-ILS/src/Android/core/res/layout/barcode_scan.xml
@@ -12,7 +12,7 @@
 	               android:layout_height="fill_parent"
 	               android:layout_centerInParent="true"/>
 	               
-	  <org.evergreen.android.barcodescan.ViewfinderView
+	  <org.evergreen_ils.barcodescan.ViewfinderView
 	      android:id="@+id/viewfinder_view"
 	      android:layout_width="fill_parent"
 	      android:layout_height="fill_parent"/>
diff --git a/Open-ILS/src/Android/core/res/layout/simple_underlines.xml b/Open-ILS/src/Android/core/res/layout/simple_underlines.xml
index 6cefa4a780..bcad2dc5e8 100644
--- a/Open-ILS/src/Android/core/res/layout/simple_underlines.xml
+++ b/Open-ILS/src/Android/core/res/layout/simple_underlines.xml
@@ -33,7 +33,7 @@
         android:layout_marginLeft="4dip"
         android:layout_marginRight="4dip"
         />
-    <org.evergreen.android.utils.ui.UnderlinePageIndicator
+    <org.evergreen_ils.utils.ui.UnderlinePageIndicator
         android:id="@+id/indicator"
         android:layout_height="2dp"
         android:layout_width="fill_parent"
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/AccountAccess.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/AccountAccess.java
similarity index 98%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/AccountAccess.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/AccountAccess.java
index 2ecab84a3b..ea2b8c3a6e 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/AccountAccess.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/AccountAccess.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess;
+package org.evergreen_ils.accountAccess;
 
 import java.io.IOException;
 import java.security.MessageDigest;
@@ -30,14 +30,14 @@ import android.os.Bundle;
 import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
-import org.evergreen.android.R;
-import org.evergreen.android.accountAccess.bookbags.BookBag;
-import org.evergreen.android.accountAccess.bookbags.BookBagItem;
-import org.evergreen.android.accountAccess.checkout.CircRecord;
-import org.evergreen.android.accountAccess.fines.FinesRecord;
-import org.evergreen.android.accountAccess.holds.HoldRecord;
-import org.evergreen.android.globals.Utils;
-import org.evergreen.android.searchCatalog.RecordInfo;
+import org.evergreen_ils.R;
+import org.evergreen_ils.accountAccess.bookbags.BookBag;
+import org.evergreen_ils.accountAccess.bookbags.BookBagItem;
+import org.evergreen_ils.accountAccess.checkout.CircRecord;
+import org.evergreen_ils.accountAccess.fines.FinesRecord;
+import org.evergreen_ils.accountAccess.holds.HoldRecord;
+import org.evergreen_ils.globals.Utils;
+import org.evergreen_ils.searchCatalog.RecordInfo;
 import org.evergreen_ils.auth.Const;
 import org.opensrf.net.http.HttpConnection;
 import org.opensrf.util.OSRFObject;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/MaxRenewalsException.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/MaxRenewalsException.java
similarity index 95%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/MaxRenewalsException.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/MaxRenewalsException.java
index e92e57ddd6..25ece60c3b 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/MaxRenewalsException.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/MaxRenewalsException.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess;
+package org.evergreen_ils.accountAccess;
 
 public class MaxRenewalsException extends Exception {
 
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/ServerErrorMessage.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/ServerErrorMessage.java
similarity index 95%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/ServerErrorMessage.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/ServerErrorMessage.java
index 2e8ee4db2e..057f08dac5 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/ServerErrorMessage.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/ServerErrorMessage.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess;
+package org.evergreen_ils.accountAccess;
 
 public class ServerErrorMessage extends Exception {
 
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/SessionNotFoundException.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/SessionNotFoundException.java
similarity index 95%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/SessionNotFoundException.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/SessionNotFoundException.java
index 130dbb7f50..fed9ea65d4 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/SessionNotFoundException.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/SessionNotFoundException.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess;
+package org.evergreen_ils.accountAccess;
 
 public class SessionNotFoundException extends Exception {
 
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookBag.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookBag.java
similarity index 96%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookBag.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookBag.java
index f3b84c04b8..cfea39e0cd 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookBag.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookBag.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess.bookbags;
+package org.evergreen_ils.accountAccess.bookbags;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookBagDetails.java
similarity index 95%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookBagDetails.java
index ca50395308..c1d9459811 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookBagDetails.java
@@ -17,19 +17,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess.bookbags;
+package org.evergreen_ils.accountAccess.bookbags;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.evergreen.android.R;
-import org.evergreen.android.accountAccess.AccountAccess;
-import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.searchCatalog.RecordInfo;
-import org.evergreen.android.searchCatalog.SearchCatalog;
-import org.evergreen.android.searchCatalog.SearchCatalogListView;
-import org.evergreen.android.views.AccountScreenDashboard;
-import org.evergreen.android.views.splashscreen.SplashActivity;
+import org.evergreen_ils.R;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.accountAccess.SessionNotFoundException;
+import org.evergreen_ils.searchCatalog.RecordInfo;
+import org.evergreen_ils.searchCatalog.SearchCatalog;
+import org.evergreen_ils.searchCatalog.SearchCatalogListView;
+import org.evergreen_ils.views.AccountScreenDashboard;
+import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookBagItem.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookBagItem.java
similarity index 91%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookBagItem.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookBagItem.java
index 579a5d9ca8..6d3712b077 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookBagItem.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookBagItem.java
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess.bookbags;
+package org.evergreen_ils.accountAccess.bookbags;
 
 import java.io.Serializable;
 
-import org.evergreen.android.searchCatalog.RecordInfo;
+import org.evergreen_ils.searchCatalog.RecordInfo;
 import org.opensrf.util.OSRFObject;
 
 public class BookBagItem implements Serializable {
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookbagsListView.java
similarity index 96%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookbagsListView.java
index 2aafa378bc..16b0b42c1c 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/bookbags/BookbagsListView.java
@@ -17,17 +17,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess.bookbags;
+package org.evergreen_ils.accountAccess.bookbags;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.evergreen.android.R;
-import org.evergreen.android.accountAccess.AccountAccess;
-import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.searchCatalog.SearchCatalogListView;
-import org.evergreen.android.views.AccountScreenDashboard;
-import org.evergreen.android.views.splashscreen.SplashActivity;
+import org.evergreen_ils.R;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.accountAccess.SessionNotFoundException;
+import org.evergreen_ils.searchCatalog.SearchCatalogListView;
+import org.evergreen_ils.views.AccountScreenDashboard;
+import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/checkout/CircRecord.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/CircRecord.java
similarity index 97%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/checkout/CircRecord.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/CircRecord.java
index 2e959729f7..8bc68d9540 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/checkout/CircRecord.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/CircRecord.java
@@ -17,13 +17,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess.checkout;
+package org.evergreen_ils.accountAccess.checkout;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.evergreen.android.globals.GlobalConfigs;
+import org.evergreen_ils.globals.GlobalConfigs;
 import org.opensrf.util.OSRFObject;
 
 /**
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/ItemsCheckOutListView.java
similarity index 96%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/ItemsCheckOutListView.java
index d4e74b10fc..312effff44 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/checkout/ItemsCheckOutListView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/ItemsCheckOutListView.java
@@ -17,21 +17,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess.checkout;
+package org.evergreen_ils.accountAccess.checkout;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 import android.opengl.Visibility;
-import org.evergreen.android.R;
-import org.evergreen.android.accountAccess.AccountAccess;
-import org.evergreen.android.accountAccess.MaxRenewalsException;
-import org.evergreen.android.accountAccess.ServerErrorMessage;
-import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.searchCatalog.SearchCatalogListView;
-import org.evergreen.android.views.AccountScreenDashboard;
-import org.evergreen.android.views.splashscreen.SplashActivity;
+import org.evergreen_ils.R;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.accountAccess.MaxRenewalsException;
+import org.evergreen_ils.accountAccess.ServerErrorMessage;
+import org.evergreen_ils.accountAccess.SessionNotFoundException;
+import org.evergreen_ils.searchCatalog.SearchCatalogListView;
+import org.evergreen_ils.views.AccountScreenDashboard;
+import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/fines/FinesActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/fines/FinesActivity.java
similarity index 95%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/fines/FinesActivity.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/fines/FinesActivity.java
index 9264be07a7..07bd4e25fd 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/fines/FinesActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/fines/FinesActivity.java
@@ -17,18 +17,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess.fines;
+package org.evergreen_ils.accountAccess.fines;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.evergreen.android.R;
-import org.evergreen.android.accountAccess.AccountAccess;
-import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.searchCatalog.SearchCatalogListView;
-import org.evergreen.android.views.AccountScreenDashboard;
-import org.evergreen.android.views.splashscreen.SplashActivity;
+import org.evergreen_ils.R;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.accountAccess.SessionNotFoundException;
+import org.evergreen_ils.searchCatalog.SearchCatalogListView;
+import org.evergreen_ils.views.AccountScreenDashboard;
+import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/fines/FinesRecord.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/fines/FinesRecord.java
similarity index 95%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/fines/FinesRecord.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/fines/FinesRecord.java
index 1e8de96a02..538b168458 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/fines/FinesRecord.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/fines/FinesRecord.java
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess.fines;
+package org.evergreen_ils.accountAccess.fines;
 
 import java.util.Date;
 
-import org.evergreen.android.globals.GlobalConfigs;
+import org.evergreen_ils.globals.GlobalConfigs;
 import org.opensrf.util.OSRFObject;
 
 public class FinesRecord {
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldDetails.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java
similarity index 97%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldDetails.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java
index 48fbb44a85..377ab0d514 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldDetails.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java
@@ -17,20 +17,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess.holds;
+package org.evergreen_ils.accountAccess.holds;
 
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 
 import android.util.Log;
-import org.evergreen.android.R;
-import org.evergreen.android.accountAccess.AccountAccess;
-import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.searchCatalog.SearchCatalogListView;
-import org.evergreen.android.views.AccountScreenDashboard;
-import org.evergreen.android.views.splashscreen.SplashActivity;
+import org.evergreen_ils.R;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.accountAccess.SessionNotFoundException;
+import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.searchCatalog.SearchCatalogListView;
+import org.evergreen_ils.views.AccountScreenDashboard;
+import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldRecord.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldRecord.java
similarity index 95%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldRecord.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldRecord.java
index d9f2e2d72a..6faf3107ae 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldRecord.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldRecord.java
@@ -17,14 +17,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess.holds;
+package org.evergreen_ils.accountAccess.holds;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import org.evergreen.android.R;
-import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.searchCatalog.RecordInfo;
+import org.evergreen_ils.R;
+import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.searchCatalog.RecordInfo;
 import org.opensrf.util.OSRFObject;
 import android.content.res.Resources;
 
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldsListView.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldsListView.java
similarity index 94%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldsListView.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldsListView.java
index 0ffacb2e2a..301be4ad81 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/HoldsListView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldsListView.java
@@ -17,19 +17,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess.holds;
+package org.evergreen_ils.accountAccess.holds;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.evergreen.android.R;
-import org.evergreen.android.accountAccess.AccountAccess;
-import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.searchCatalog.ImageDownloader;
-import org.evergreen.android.searchCatalog.SearchCatalogListView;
-import org.evergreen.android.views.AccountScreenDashboard;
-import org.evergreen.android.views.splashscreen.SplashActivity;
+import org.evergreen_ils.R;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.accountAccess.SessionNotFoundException;
+import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.searchCatalog.ImageDownloader;
+import org.evergreen_ils.searchCatalog.SearchCatalogListView;
+import org.evergreen_ils.views.AccountScreenDashboard;
+import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
@@ -48,6 +48,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
+import org.evergreen_ils.accountAccess.holds.HoldRecord;
 
 public class HoldsListView extends Activity {
 
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/PlaceHold.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java
similarity index 96%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/PlaceHold.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java
index 82d083860e..8c1ce74caf 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/accountAccess/holds/PlaceHold.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java
@@ -17,21 +17,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.accountAccess.holds;
+package org.evergreen_ils.accountAccess.holds;
 
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 
 import android.util.Log;
-import org.evergreen.android.R;
-import org.evergreen.android.accountAccess.AccountAccess;
-import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.searchCatalog.RecordInfo;
-import org.evergreen.android.searchCatalog.SearchCatalogListView;
-import org.evergreen.android.views.AccountScreenDashboard;
-import org.evergreen.android.views.splashscreen.SplashActivity;
+import org.evergreen_ils.R;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.accountAccess.SessionNotFoundException;
+import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.searchCatalog.RecordInfo;
+import org.evergreen_ils.searchCatalog.SearchCatalogListView;
+import org.evergreen_ils.views.AccountScreenDashboard;
+import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
 import android.app.DatePickerDialog;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/AuthenticatorActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/AuthenticatorActivity.java
index 037452cd74..f43042a15d 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/AuthenticatorActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/AuthenticatorActivity.java
@@ -1,7 +1,7 @@
 package org.evergreen_ils.auth;
 
 import android.preference.PreferenceManager;
-import org.evergreen.android.R;
+import org.evergreen_ils.R;
 import org.evergreen_ils.auth.Const;
 
 import android.accounts.Account;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/EvergreenAuthenticator.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/EvergreenAuthenticator.java
index b1eef4eb3a..0e32462f57 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/EvergreenAuthenticator.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/auth/EvergreenAuthenticator.java
@@ -15,7 +15,7 @@ import org.opensrf.net.http.HttpRequest;
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.Log;
-import org.evergreen.android.R;
+import org.evergreen_ils.R;
 
 public class EvergreenAuthenticator {
     private final static String TAG = "eg.auth";
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/CaptureActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/CaptureActivity.java
similarity index 96%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/CaptureActivity.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/CaptureActivity.java
index 015975b819..8516c3e039 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/CaptureActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/CaptureActivity.java
@@ -1,11 +1,11 @@
-package org.evergreen.android.barcodescan;
+package org.evergreen_ils.barcodescan;
 
 import java.io.IOException;
 import java.util.Vector;
 
-import org.evergreen.android.R;
-import org.evergreen.android.barcodescan.camera.CameraManager;
-import org.evergreen.android.views.splashscreen.SplashActivity;
+import org.evergreen_ils.R;
+import org.evergreen_ils.barcodescan.camera.CameraManager;
+import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/CaptureActivityHandler.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/CaptureActivityHandler.java
similarity index 96%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/CaptureActivityHandler.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/CaptureActivityHandler.java
index a594c2778d..8165cc3638 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/CaptureActivityHandler.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/CaptureActivityHandler.java
@@ -1,10 +1,10 @@
 
-package org.evergreen.android.barcodescan;
+package org.evergreen_ils.barcodescan;
 
 import java.util.Vector;
 
-import org.evergreen.android.R;
-import org.evergreen.android.barcodescan.camera.CameraManager;
+import org.evergreen_ils.R;
+import org.evergreen_ils.barcodescan.camera.CameraManager;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/DecodeFormatManager.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/DecodeFormatManager.java
similarity index 98%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/DecodeFormatManager.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/DecodeFormatManager.java
index f89f283032..701941b166 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/DecodeFormatManager.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/DecodeFormatManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.evergreen.android.barcodescan;
+package org.evergreen_ils.barcodescan;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/DecodeHandler.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/DecodeHandler.java
similarity index 96%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/DecodeHandler.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/DecodeHandler.java
index 9c49472cce..713de87ca0 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/DecodeHandler.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/DecodeHandler.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.evergreen.android.barcodescan;
+package org.evergreen_ils.barcodescan;
 
 import java.util.Hashtable;
-import org.evergreen.android.R;
-import org.evergreen.android.barcodescan.camera.CameraManager;
+import org.evergreen_ils.R;
+import org.evergreen_ils.barcodescan.camera.CameraManager;
 
 import android.os.Bundle;
 import android.os.Handler;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/DecodeThread.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/DecodeThread.java
similarity index 96%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/DecodeThread.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/DecodeThread.java
index d48d3e7394..07c8cc2286 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/DecodeThread.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/DecodeThread.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.evergreen.android.barcodescan;
+package org.evergreen_ils.barcodescan;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.DecodeHintType;
@@ -29,7 +29,7 @@ import java.util.Hashtable;
 import java.util.Vector;
 import java.util.concurrent.CountDownLatch;
 
-import org.evergreen.android.barcodescan.camera.CameraManager;
+import org.evergreen_ils.barcodescan.camera.CameraManager;
 
 /**
  * This thread does all the heavy lifting of decoding the images.
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/FinishListener.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/FinishListener.java
similarity index 96%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/FinishListener.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/FinishListener.java
index c184c1aa48..da7f6e8442 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/FinishListener.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/FinishListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.evergreen.android.barcodescan;
+package org.evergreen_ils.barcodescan;
 
 import android.app.Activity;
 import android.content.DialogInterface;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/Functions.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/Functions.java
similarity index 91%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/Functions.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/Functions.java
index 57bee3eb15..f7e11f5b0d 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/Functions.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/Functions.java
@@ -1,4 +1,4 @@
-package org.evergreen.android.barcodescan;
+package org.evergreen_ils.barcodescan;
 
 import android.content.Context;
 import android.graphics.Color;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/Intents.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/Intents.java
similarity index 99%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/Intents.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/Intents.java
index f0edb4264f..04b010ec0e 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/Intents.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/Intents.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.evergreen.android.barcodescan;
+package org.evergreen_ils.barcodescan;
 
 /**
  * This class provides the constants to use when sending an Intent to Barcode Scanner.
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/PlanarYUVLuminanceSource.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/PlanarYUVLuminanceSource.java
similarity index 99%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/PlanarYUVLuminanceSource.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/PlanarYUVLuminanceSource.java
index 86c9f8d33e..eba9e946fb 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/PlanarYUVLuminanceSource.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/PlanarYUVLuminanceSource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.evergreen.android.barcodescan;
+package org.evergreen_ils.barcodescan;
 
 import com.google.zxing.LuminanceSource;
 
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/PreferencesActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/PreferencesActivity.java
similarity index 98%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/PreferencesActivity.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/PreferencesActivity.java
index 87527e6c9b..3461714ac3 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/PreferencesActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/PreferencesActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.evergreen.android.barcodescan;
+package org.evergreen_ils.barcodescan;
 
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/ViewfinderResultPointCallback.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/ViewfinderResultPointCallback.java
similarity index 96%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/ViewfinderResultPointCallback.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/ViewfinderResultPointCallback.java
index e64dca3fcb..7a90f6343f 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/ViewfinderResultPointCallback.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/ViewfinderResultPointCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.evergreen.android.barcodescan;
+package org.evergreen_ils.barcodescan;
 
 import com.google.zxing.ResultPoint;
 import com.google.zxing.ResultPointCallback;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/ViewfinderView.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/ViewfinderView.java
similarity index 98%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/ViewfinderView.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/ViewfinderView.java
index f51c7f13cc..44ab328523 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/ViewfinderView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/ViewfinderView.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.evergreen.android.barcodescan;
+package org.evergreen_ils.barcodescan;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.evergreen.android.R;
-import org.evergreen.android.barcodescan.camera.CameraManager;
+import org.evergreen_ils.R;
+import org.evergreen_ils.barcodescan.camera.CameraManager;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/camera/AutoFocusCallback.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/camera/AutoFocusCallback.java
similarity index 97%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/camera/AutoFocusCallback.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/camera/AutoFocusCallback.java
index 3ad0a735ea..c19fd2db13 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/camera/AutoFocusCallback.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/camera/AutoFocusCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.evergreen.android.barcodescan.camera;
+package org.evergreen_ils.barcodescan.camera;
 
 import android.hardware.Camera;
 import android.os.Handler;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/camera/CameraConfigurationManager.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/camera/CameraConfigurationManager.java
similarity index 98%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/camera/CameraConfigurationManager.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/camera/CameraConfigurationManager.java
index d2327b0b6e..2c59126522 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/camera/CameraConfigurationManager.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/camera/CameraConfigurationManager.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.evergreen.android.barcodescan.camera;
+package org.evergreen_ils.barcodescan.camera;
 
 import java.util.Collection;
 
-import org.evergreen.android.barcodescan.PreferencesActivity;
+import org.evergreen_ils.barcodescan.PreferencesActivity;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/camera/CameraManager.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/camera/CameraManager.java
similarity index 98%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/camera/CameraManager.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/camera/CameraManager.java
index 60a442d725..ce3d53833a 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/camera/CameraManager.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/camera/CameraManager.java
@@ -15,12 +15,12 @@
  */
 
 
-package org.evergreen.android.barcodescan.camera;
+package org.evergreen_ils.barcodescan.camera;
 
 import java.io.IOException;
 
-import org.evergreen.android.barcodescan.PlanarYUVLuminanceSource;
-import org.evergreen.android.barcodescan.PreferencesActivity;
+import org.evergreen_ils.barcodescan.PlanarYUVLuminanceSource;
+import org.evergreen_ils.barcodescan.PreferencesActivity;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/camera/FlashlightManager.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/camera/FlashlightManager.java
similarity index 98%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/camera/FlashlightManager.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/camera/FlashlightManager.java
index 40393e9d6c..25b990605c 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/camera/FlashlightManager.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/camera/FlashlightManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.evergreen.android.barcodescan.camera;
+package org.evergreen_ils.barcodescan.camera;
 
 import android.os.IBinder;
 import android.util.Log;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/camera/PreviewCallback.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/camera/PreviewCallback.java
similarity index 97%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/camera/PreviewCallback.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/camera/PreviewCallback.java
index a371a990c9..807227d272 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/camera/PreviewCallback.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/camera/PreviewCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.evergreen.android.barcodescan.camera;
+package org.evergreen_ils.barcodescan.camera;
 /*
  * Copyright (C) 2010 ZXing authors
  *
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/result/ResultHandler.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/result/ResultHandler.java
similarity index 97%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/result/ResultHandler.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/result/ResultHandler.java
index ed8b3e6585..8e1939866d 100755
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/barcodescan/result/ResultHandler.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/result/ResultHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.evergreen.android.barcodescan.result;
+package org.evergreen_ils.barcodescan.result;
 
 import com.google.zxing.Result;
 import com.google.zxing.client.result.ParsedResult;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/database/DatabaseManager.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/database/DatabaseManager.java
similarity index 97%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/database/DatabaseManager.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/database/DatabaseManager.java
index b9a1461d01..860975e883 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/database/DatabaseManager.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/database/DatabaseManager.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.database;
+package org.evergreen_ils.database;
 
 import java.util.HashMap;
 import java.util.logging.Logger;
@@ -26,7 +26,7 @@ import org.androwrapee.db.DefaultDAO;
 import org.androwrapee.db.DefaultDatabaseHelper;
 import org.androwrapee.db.IllegalClassStructureException;
 import org.androwrapee.db.ReflectionManager;
-import org.evergreen.android.services.NotificationAlert;
+import org.evergreen_ils.services.NotificationAlert;
 
 import android.content.Context;
 import android.util.Log;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/globals/EvergreenConstants.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/globals/EvergreenConstants.java
similarity index 99%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/globals/EvergreenConstants.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/globals/EvergreenConstants.java
index c076ec99d3..406c8d3ed6 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/globals/EvergreenConstants.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/globals/EvergreenConstants.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2013 Evergreen Open-ILS
  * @author kenstir
  */
-package org.evergreen.android.globals;
+package org.evergreen_ils.globals;
 
 /**
  * Conversion of constants from Const.pm
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/globals/GlobalConfigs.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/globals/GlobalConfigs.java
similarity index 97%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/globals/GlobalConfigs.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/globals/GlobalConfigs.java
index f05c02f198..3d02947216 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/globals/GlobalConfigs.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/globals/GlobalConfigs.java
@@ -17,15 +17,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.globals;
+package org.evergreen_ils.globals;
 
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.util.Log;
-import org.evergreen.android.accountAccess.AccountAccess;
-import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.searchCatalog.Organisation;
-import org.evergreen.android.searchCatalog.SearchCatalog;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.accountAccess.SessionNotFoundException;
+import org.evergreen_ils.searchCatalog.Organisation;
+import org.evergreen_ils.searchCatalog.SearchCatalog;
 import org.open_ils.idl.IDLParser;
 import org.opensrf.util.JSONException;
 import org.opensrf.util.JSONReader;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/globals/ShowServerNotAvailableRunnable.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/globals/ShowServerNotAvailableRunnable.java
similarity index 97%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/globals/ShowServerNotAvailableRunnable.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/globals/ShowServerNotAvailableRunnable.java
index 8ae553b570..53b42d7ba5 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/globals/ShowServerNotAvailableRunnable.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/globals/ShowServerNotAvailableRunnable.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.globals;
+package org.evergreen_ils.globals;
 
 import android.app.AlertDialog;
 import android.content.Context;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/globals/ShowSessionNotAvailableRunnable.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/globals/ShowSessionNotAvailableRunnable.java
similarity index 97%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/globals/ShowSessionNotAvailableRunnable.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/globals/ShowSessionNotAvailableRunnable.java
index 9b73f1cc43..11f6cd20ee 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/globals/ShowSessionNotAvailableRunnable.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/globals/ShowSessionNotAvailableRunnable.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.globals;
+package org.evergreen_ils.globals;
 
 import android.app.AlertDialog;
 import android.content.Context;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/globals/Utils.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/globals/Utils.java
similarity index 99%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/globals/Utils.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/globals/Utils.java
index 30e454ccf6..e73fc66e11 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/globals/Utils.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/globals/Utils.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.globals;
+package org.evergreen_ils.globals;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -35,7 +35,7 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;
-import org.evergreen.android.accountAccess.SessionNotFoundException;
+import org.evergreen_ils.accountAccess.SessionNotFoundException;
 import org.opensrf.Method;
 import org.opensrf.net.http.GatewayRequest;
 import org.opensrf.net.http.HttpConnection;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/AdvancedSearchActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/AdvancedSearchActivity.java
similarity index 96%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/AdvancedSearchActivity.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/AdvancedSearchActivity.java
index d0f8236e16..1065ab66c7 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/AdvancedSearchActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/AdvancedSearchActivity.java
@@ -17,14 +17,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.searchCatalog;
+package org.evergreen_ils.searchCatalog;
 
 import java.util.StringTokenizer;
 
-import org.evergreen.android.R;
-import org.evergreen.android.accountAccess.AccountAccess;
-import org.evergreen.android.views.AccountScreenDashboard;
-import org.evergreen.android.views.splashscreen.SplashActivity;
+import org.evergreen_ils.R;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.views.AccountScreenDashboard;
+import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/CopyCountInformation.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/CopyCountInformation.java
similarity index 97%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/CopyCountInformation.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/CopyCountInformation.java
index d16fdde7b3..87ae779958 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/CopyCountInformation.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/CopyCountInformation.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.searchCatalog;
+package org.evergreen_ils.searchCatalog;
 
 import android.util.Log;
 
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/CopyInformation.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/CopyInformation.java
similarity index 98%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/CopyInformation.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/CopyInformation.java
index 4c5d8d95e4..f548ff2c8a 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/CopyInformation.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/CopyInformation.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.searchCatalog;
+package org.evergreen_ils.searchCatalog;
 
 import android.util.Log;
 
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/ImageDownloader.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/ImageDownloader.java
similarity index 99%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/ImageDownloader.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/ImageDownloader.java
index 0db23a35ee..85437167cc 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/ImageDownloader.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/ImageDownloader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.evergreen.android.searchCatalog;
+package org.evergreen_ils.searchCatalog;
 
 import java.io.FilterInputStream;
 import java.io.IOException;
@@ -31,7 +31,7 @@ import org.apache.http.HttpStatus;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;
-import org.evergreen.android.R;
+import org.evergreen_ils.R;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/MoreCopyInformation.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/MoreCopyInformation.java
similarity index 95%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/MoreCopyInformation.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/MoreCopyInformation.java
index e53d6dd905..d721cb33ba 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/MoreCopyInformation.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/MoreCopyInformation.java
@@ -17,16 +17,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.searchCatalog;
+package org.evergreen_ils.searchCatalog;
 
 import java.util.Iterator;
 import java.util.Set;
 import java.util.Map.Entry;
 
-import org.evergreen.android.R;
-import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.views.AccountScreenDashboard;
-import org.evergreen.android.views.splashscreen.SplashActivity;
+import org.evergreen_ils.R;
+import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.views.AccountScreenDashboard;
+import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/Organisation.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Organisation.java
similarity index 96%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/Organisation.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Organisation.java
index acbb0cd652..15ee726761 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/Organisation.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Organisation.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.searchCatalog;
+package org.evergreen_ils.searchCatalog;
 
 public class Organisation {
 
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/RecordInfo.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/RecordInfo.java
similarity index 99%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/RecordInfo.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/RecordInfo.java
index 7889187256..402a20337c 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/RecordInfo.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/RecordInfo.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.searchCatalog;
+package org.evergreen_ils.searchCatalog;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SampleUnderlinesNoFade.java
similarity index 93%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SampleUnderlinesNoFade.java
index b15270a033..0633d21baf 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SampleUnderlinesNoFade.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SampleUnderlinesNoFade.java
@@ -17,17 +17,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.searchCatalog;
+package org.evergreen_ils.searchCatalog;
 
 import java.util.ArrayList;
 
-import org.evergreen.android.R;
-import org.evergreen.android.utils.ui.BaseSampleActivity;
-import org.evergreen.android.utils.ui.BasicDetailsFragment;
-import org.evergreen.android.utils.ui.TestFragmentAdapter;
-import org.evergreen.android.utils.ui.UnderlinePageIndicator;
-import org.evergreen.android.views.AccountScreenDashboard;
-import org.evergreen.android.views.splashscreen.SplashActivity;
+import org.evergreen_ils.R;
+import org.evergreen_ils.utils.ui.BaseSampleActivity;
+import org.evergreen_ils.utils.ui.BasicDetailsFragment;
+import org.evergreen_ils.utils.ui.TestFragmentAdapter;
+import org.evergreen_ils.utils.ui.UnderlinePageIndicator;
+import org.evergreen_ils.views.AccountScreenDashboard;
+import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.ProgressDialog;
 import android.content.Context;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SearchCatalog.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalog.java
similarity index 98%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SearchCatalog.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalog.java
index f8fd9938e4..71760d39cc 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SearchCatalog.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalog.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.searchCatalog;
+package org.evergreen_ils.searchCatalog;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,8 +25,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.globals.Utils;
+import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.globals.Utils;
 import org.opensrf.Method;
 import org.opensrf.net.http.GatewayRequest;
 import org.opensrf.net.http.HttpConnection;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java
similarity index 97%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java
index 1d0f5186f9..776f3be4da 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java
@@ -17,22 +17,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.searchCatalog;
+package org.evergreen_ils.searchCatalog;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.evergreen.android.R;
-import org.evergreen.android.R.layout;
-import org.evergreen.android.accountAccess.AccountAccess;
-import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.accountAccess.bookbags.BookBag;
-import org.evergreen.android.accountAccess.holds.PlaceHold;
-import org.evergreen.android.barcodescan.CaptureActivity;
-import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.views.AccountScreenDashboard;
-import org.evergreen.android.views.ApplicationPreferences;
-import org.evergreen.android.views.splashscreen.SplashActivity;
+import org.evergreen_ils.R;
+import org.evergreen_ils.R.layout;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.accountAccess.SessionNotFoundException;
+import org.evergreen_ils.accountAccess.bookbags.BookBag;
+import org.evergreen_ils.accountAccess.holds.PlaceHold;
+import org.evergreen_ils.barcodescan.CaptureActivity;
+import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.views.AccountScreenDashboard;
+import org.evergreen_ils.views.ApplicationPreferences;
+import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/services/NotificationAlert.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/services/NotificationAlert.java
similarity index 97%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/services/NotificationAlert.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/services/NotificationAlert.java
index 3aaa2e7d1d..73be455ac6 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/services/NotificationAlert.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/services/NotificationAlert.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.services;
+package org.evergreen_ils.services;
 
 import java.util.Date;
 
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/services/NotificationReceiver.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/services/NotificationReceiver.java
similarity index 96%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/services/NotificationReceiver.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/services/NotificationReceiver.java
index c4ada30fa5..1904c2dcc4 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/services/NotificationReceiver.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/services/NotificationReceiver.java
@@ -17,9 +17,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.services;
+package org.evergreen_ils.services;
 
-import org.evergreen.android.views.splashscreen.SplashActivity;
+import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Notification;
 import android.app.NotificationManager;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/services/PeriodicServiceBroadcastReceiver.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/services/PeriodicServiceBroadcastReceiver.java
similarity index 98%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/services/PeriodicServiceBroadcastReceiver.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/services/PeriodicServiceBroadcastReceiver.java
index a087466f91..f5a0cee48a 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/services/PeriodicServiceBroadcastReceiver.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/services/PeriodicServiceBroadcastReceiver.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.services;
+package org.evergreen_ils.services;
 
 import java.util.Calendar;
 
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/services/RebootReceiver.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/services/RebootReceiver.java
similarity index 98%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/services/RebootReceiver.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/services/RebootReceiver.java
index 1a873a949e..e2ba90e962 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/services/RebootReceiver.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/services/RebootReceiver.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.services;
+package org.evergreen_ils.services;
 
 import java.util.Calendar;
 
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/services/ScheduledIntentService.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/services/ScheduledIntentService.java
similarity index 95%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/services/ScheduledIntentService.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/services/ScheduledIntentService.java
index 1e63fa499f..a043b1a82e 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/services/ScheduledIntentService.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/services/ScheduledIntentService.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.services;
+package org.evergreen_ils.services;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -29,12 +29,12 @@ import android.accounts.AccountManager;
 import android.accounts.AccountManagerFuture;
 import android.os.Bundle;
 import org.androwrapee.db.DefaultDAO;
-import org.evergreen.android.accountAccess.AccountAccess;
-import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.accountAccess.checkout.CircRecord;
-import org.evergreen.android.database.DatabaseManager;
-import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.globals.Utils;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.accountAccess.SessionNotFoundException;
+import org.evergreen_ils.accountAccess.checkout.CircRecord;
+import org.evergreen_ils.database.DatabaseManager;
+import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.globals.Utils;
 import org.evergreen_ils.auth.Const;
 import org.open_ils.idl.IDLParser;
 
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/BaseSampleActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/BaseSampleActivity.java
similarity index 96%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/BaseSampleActivity.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/BaseSampleActivity.java
index 72c5f843e6..46cb48de6a 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/BaseSampleActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/BaseSampleActivity.java
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.utils.ui;
+package org.evergreen_ils.utils.ui;
 
 import java.util.Random;
 
-import org.evergreen.android.R;
+import org.evergreen_ils.R;
 
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.view.ViewPager;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/BasicDetailsFragment.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/BasicDetailsFragment.java
similarity index 95%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/BasicDetailsFragment.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/BasicDetailsFragment.java
index 4f2228b772..fb9175b18a 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/BasicDetailsFragment.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/BasicDetailsFragment.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.utils.ui;
+package org.evergreen_ils.utils.ui;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -25,17 +25,17 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import android.util.Log;
-import org.evergreen.android.R;
-import org.evergreen.android.accountAccess.AccountAccess;
-import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.accountAccess.bookbags.BookBag;
-import org.evergreen.android.accountAccess.holds.PlaceHold;
-import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.searchCatalog.CopyInformation;
-import org.evergreen.android.searchCatalog.ImageDownloader;
-import org.evergreen.android.searchCatalog.MoreCopyInformation;
-import org.evergreen.android.searchCatalog.RecordInfo;
-import org.evergreen.android.searchCatalog.SearchCatalog;
+import org.evergreen_ils.R;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.accountAccess.SessionNotFoundException;
+import org.evergreen_ils.accountAccess.bookbags.BookBag;
+import org.evergreen_ils.accountAccess.holds.PlaceHold;
+import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.searchCatalog.CopyInformation;
+import org.evergreen_ils.searchCatalog.ImageDownloader;
+import org.evergreen_ils.searchCatalog.MoreCopyInformation;
+import org.evergreen_ils.searchCatalog.RecordInfo;
+import org.evergreen_ils.searchCatalog.SearchCatalog;
 
 import android.app.Dialog;
 import android.app.ProgressDialog;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/Dashboard.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/Dashboard.java
similarity index 99%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/Dashboard.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/Dashboard.java
index 9ef43aab3a..bbda569882 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/Dashboard.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/Dashboard.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.utils.ui;
+package org.evergreen_ils.utils.ui;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/PageIndicator.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/PageIndicator.java
similarity index 98%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/PageIndicator.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/PageIndicator.java
index 80d14b2e6d..86aecd4c20 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/PageIndicator.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/PageIndicator.java
@@ -18,7 +18,7 @@
  * 
  */
 
-package org.evergreen.android.utils.ui;
+package org.evergreen_ils.utils.ui;
 
 import android.support.v4.view.ViewPager;
 
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/TabPageIndicator.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/TabPageIndicator.java
similarity index 99%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/TabPageIndicator.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/TabPageIndicator.java
index 2f39281bfe..d5c1685f22 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/TabPageIndicator.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/TabPageIndicator.java
@@ -18,11 +18,11 @@
  * 
  */
 
-package org.evergreen.android.utils.ui;
+package org.evergreen_ils.utils.ui;
 
 import static android.view.ViewGroup.LayoutParams;
 
-import org.evergreen.android.R;
+import org.evergreen_ils.R;
 
 import android.content.Context;
 import android.support.v4.view.PagerAdapter;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/TestFragment.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/TestFragment.java
similarity index 95%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/TestFragment.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/TestFragment.java
index b29c288c81..36df8dde65 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/TestFragment.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/TestFragment.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.utils.ui;
+package org.evergreen_ils.utils.ui;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/TestFragmentAdapter.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/TestFragmentAdapter.java
similarity index 94%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/TestFragmentAdapter.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/TestFragmentAdapter.java
index ec9077cf86..120043b678 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/TestFragmentAdapter.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/TestFragmentAdapter.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.utils.ui;
+package org.evergreen_ils.utils.ui;
 
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/TitlePageIndicator.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/TitlePageIndicator.java
similarity index 99%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/TitlePageIndicator.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/TitlePageIndicator.java
index 5b25c2bc05..7b8de0e13d 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/TitlePageIndicator.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/TitlePageIndicator.java
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.utils.ui;
+package org.evergreen_ils.utils.ui;
 
 import java.util.ArrayList;
 
-import org.evergreen.android.R;
+import org.evergreen_ils.R;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/UnderlinePageIndicator.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/UnderlinePageIndicator.java
similarity index 99%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/UnderlinePageIndicator.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/UnderlinePageIndicator.java
index ec6fe2b7ec..e692437cdd 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/utils/ui/UnderlinePageIndicator.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/utils/ui/UnderlinePageIndicator.java
@@ -17,9 +17,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.utils.ui;
+package org.evergreen_ils.utils.ui;
 
-import org.evergreen.android.R;
+import org.evergreen_ils.R;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/views/AccountScreenDashboard.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/AccountScreenDashboard.java
similarity index 92%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/views/AccountScreenDashboard.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/views/AccountScreenDashboard.java
index 9adc1e16fc..e55b42d518 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/views/AccountScreenDashboard.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/AccountScreenDashboard.java
@@ -17,15 +17,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.views;
-
-import org.evergreen.android.R;
-import org.evergreen.android.accountAccess.bookbags.BookbagsListView;
-import org.evergreen.android.accountAccess.checkout.ItemsCheckOutListView;
-import org.evergreen.android.accountAccess.fines.FinesActivity;
-import org.evergreen.android.accountAccess.holds.HoldsListView;
-import org.evergreen.android.searchCatalog.SearchCatalogListView;
-import org.evergreen.android.views.splashscreen.SplashActivity;
+package org.evergreen_ils.views;
+
+import org.evergreen_ils.R;
+import org.evergreen_ils.accountAccess.bookbags.BookbagsListView;
+import org.evergreen_ils.accountAccess.checkout.ItemsCheckOutListView;
+import org.evergreen_ils.accountAccess.fines.FinesActivity;
+import org.evergreen_ils.accountAccess.holds.HoldsListView;
+import org.evergreen_ils.searchCatalog.SearchCatalogListView;
+import org.evergreen_ils.views.splashscreen.SplashActivity;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/views/ApplicationPreferences.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ApplicationPreferences.java
similarity index 94%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/views/ApplicationPreferences.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/views/ApplicationPreferences.java
index 33113ea209..3b0ed13a6c 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/views/ApplicationPreferences.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ApplicationPreferences.java
@@ -17,15 +17,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.views;
+package org.evergreen_ils.views;
 
 import java.util.Calendar;
 
-import org.evergreen.android.R;
-import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.services.NotificationAlert;
-import org.evergreen.android.services.PeriodicServiceBroadcastReceiver;
-import org.evergreen.android.services.ScheduledIntentService;
+import org.evergreen_ils.R;
+import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.services.NotificationAlert;
+import org.evergreen_ils.services.PeriodicServiceBroadcastReceiver;
+import org.evergreen_ils.services.ScheduledIntentService;
 import org.evergreen_ils.auth.Const;
 
 import android.app.AlarmManager;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/views/splashscreen/LoadingTask.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/LoadingTask.java
similarity index 95%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/views/splashscreen/LoadingTask.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/LoadingTask.java
index 96a6cd4bb6..74d442082e 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/views/splashscreen/LoadingTask.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/LoadingTask.java
@@ -17,12 +17,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.views.splashscreen;
+package org.evergreen_ils.views.splashscreen;
 
-import org.evergreen.android.R;
-import org.evergreen.android.accountAccess.AccountAccess;
-import org.evergreen.android.accountAccess.SessionNotFoundException;
-import org.evergreen.android.globals.GlobalConfigs;
+import org.evergreen_ils.R;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.accountAccess.SessionNotFoundException;
+import org.evergreen_ils.globals.GlobalConfigs;
 import org.evergreen_ils.auth.Const;
 
 import android.accounts.Account;
diff --git a/Open-ILS/src/Android/core/src/org/evergreen/android/views/splashscreen/SplashActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java
similarity index 93%
rename from Open-ILS/src/Android/core/src/org/evergreen/android/views/splashscreen/SplashActivity.java
rename to Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java
index c5de354ebe..75092e3e4e 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen/android/views/splashscreen/SplashActivity.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java
@@ -17,13 +17,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  * 
  */
-package org.evergreen.android.views.splashscreen;
+package org.evergreen_ils.views.splashscreen;
 
-import org.evergreen.android.R;
-import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.searchCatalog.SearchCatalogListView;
-import org.evergreen.android.views.ApplicationPreferences;
-import org.evergreen.android.views.splashscreen.LoadingTask.LoadingTaskListener;
+import org.evergreen_ils.R;
+import org.evergreen_ils.globals.GlobalConfigs;
+import org.evergreen_ils.searchCatalog.SearchCatalogListView;
+import org.evergreen_ils.views.ApplicationPreferences;
+import org.evergreen_ils.views.splashscreen.LoadingTask.LoadingTaskListener;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
index bb99a1cd7c..549226e506 100644
--- a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
@@ -32,25 +32,25 @@
 
         <!-- Notification receiver -->
         <receiver
-            android:name="org.evergreen.android.services.NotificationReceiver"
+            android:name="org.evergreen_ils.services.NotificationReceiver"
             android:process=":remote" >
         </receiver>
         <!-- Receiver to reinit notifications on reboot -->
-        <receiver android:name="org.evergreen.android.services.RebootReceiver" >
+        <receiver android:name="org.evergreen_ils.services.RebootReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
-        <receiver android:name="org.evergreen.android.services.PeriodicServiceBroadcastReceiver" >
+        <receiver android:name="org.evergreen_ils.services.PeriodicServiceBroadcastReceiver" >
             <intent-filter>
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
             </intent-filter>
         </receiver>
 
-        <service android:name="org.evergreen.android.services.ScheduledIntentService" >
+        <service android:name="org.evergreen_ils.services.ScheduledIntentService" >
         </service>
 
-        <activity android:name="org.evergreen.android.views.splashscreen.SplashActivity">
+        <activity android:name="org.evergreen_ils.views.splashscreen.SplashActivity">
             <!--  android:theme="@android:style/Theme.Light.NoTitleBar"  -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -59,51 +59,51 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="org.evergreen.android.views.AccountScreenDashboard"
+            android:name="org.evergreen_ils.views.AccountScreenDashboard"
             android:theme="@android:style/Theme.Light.NoTitleBar" >
         </activity>
-        <activity android:name="org.evergreen.android.views.ApplicationPreferences" >
+        <activity android:name="org.evergreen_ils.views.ApplicationPreferences" >
         </activity>
 
         <!-- Search -->
 
         <activity
-            android:name="org.evergreen.android.searchCatalog.SampleUnderlinesNoFade"
+            android:name="org.evergreen_ils.searchCatalog.SampleUnderlinesNoFade"
             android:label="Underlines/No Fade" >
         </activity>
-        <activity android:name="org.evergreen.android.searchCatalog.MoreCopyInformation" >
+        <activity android:name="org.evergreen_ils.searchCatalog.MoreCopyInformation" >
         </activity>
-        <activity android:name="org.evergreen.android.searchCatalog.SearchCatalogListView">
+        <activity android:name="org.evergreen_ils.searchCatalog.SearchCatalogListView">
         </activity>
-        <activity android:name="org.evergreen.android.searchCatalog.AdvancedSearchActivity" >
+        <activity android:name="org.evergreen_ils.searchCatalog.AdvancedSearchActivity" >
         </activity>
         <activity
-            android:name="org.evergreen.android.barcodescan.CaptureActivity"
+            android:name="org.evergreen_ils.barcodescan.CaptureActivity"
             android:screenOrientation="landscape"
             android:theme="@android:style/Theme.NoTitleBar"
             android:windowSoftInputMode="stateAlwaysHidden" >
         </activity>
 
         <!-- Checkout Activities -->
-        <activity android:name="org.evergreen.android.accountAccess.checkout.ItemsCheckOutListView" >
+        <activity android:name="org.evergreen_ils.accountAccess.checkout.ItemsCheckOutListView" >
         </activity>
 
         <!-- Holds Activities -->
-        <activity android:name="org.evergreen.android.accountAccess.holds.HoldsListView" >
+        <activity android:name="org.evergreen_ils.accountAccess.holds.HoldsListView" >
         </activity>
-        <activity android:name="org.evergreen.android.accountAccess.holds.PlaceHold" >
+        <activity android:name="org.evergreen_ils.accountAccess.holds.PlaceHold" >
         </activity>
-        <activity android:name="org.evergreen.android.accountAccess.holds.HoldDetails" >
+        <activity android:name="org.evergreen_ils.accountAccess.holds.HoldDetails" >
         </activity>
 
         <!-- Fines Activities -->
-        <activity android:name="org.evergreen.android.accountAccess.fines.FinesActivity" >
+        <activity android:name="org.evergreen_ils.accountAccess.fines.FinesActivity" >
         </activity>
 
         <!-- Bookbags -->
-        <activity android:name="org.evergreen.android.accountAccess.bookbags.BookbagsListView" >
+        <activity android:name="org.evergreen_ils.accountAccess.bookbags.BookbagsListView" >
         </activity>
-        <activity android:name="org.evergreen.android.accountAccess.bookbags.BookBagDetails" >
+        <activity android:name="org.evergreen_ils.accountAccess.bookbags.BookBagDetails" >
         </activity>
 
         <activity
diff --git a/Open-ILS/src/Android/demo_app/AndroidManifest.xml b/Open-ILS/src/Android/demo_app/AndroidManifest.xml
index d4a0f5eada..053c9c2bc2 100644
--- a/Open-ILS/src/Android/demo_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/demo_app/AndroidManifest.xml
@@ -32,25 +32,25 @@
 
         <!-- Notification receiver -->
         <receiver
-                android:name="org.evergreen.android.services.NotificationReceiver"
+                android:name="org.evergreen_ils.services.NotificationReceiver"
                 android:process=":remote">
         </receiver>
         <!-- Receiver to reinit notifications on reboot -->
-        <receiver android:name="org.evergreen.android.services.RebootReceiver">
+        <receiver android:name="org.evergreen_ils.services.RebootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
-        <receiver android:name="org.evergreen.android.services.PeriodicServiceBroadcastReceiver">
+        <receiver android:name="org.evergreen_ils.services.PeriodicServiceBroadcastReceiver">
             <intent-filter>
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
             </intent-filter>
         </receiver>
 
-        <service android:name="org.evergreen.android.services.ScheduledIntentService">
+        <service android:name="org.evergreen_ils.services.ScheduledIntentService">
         </service>
 
-        <activity android:name="org.evergreen.android.views.splashscreen.SplashActivity">
+        <activity android:name="org.evergreen_ils.views.splashscreen.SplashActivity">
             <!--  android:theme="@android:style/Theme.Light.NoTitleBar"  -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -59,51 +59,51 @@
             </intent-filter>
         </activity>
         <activity
-                android:name="org.evergreen.android.views.AccountScreenDashboard"
+                android:name="org.evergreen_ils.views.AccountScreenDashboard"
                 android:theme="@android:style/Theme.Light.NoTitleBar">
         </activity>
-        <activity android:name="org.evergreen.android.views.ApplicationPreferences">
+        <activity android:name="org.evergreen_ils.views.ApplicationPreferences">
         </activity>
 
         <!-- Search -->
 
         <activity
-                android:name="org.evergreen.android.searchCatalog.SampleUnderlinesNoFade"
+                android:name="org.evergreen_ils.searchCatalog.SampleUnderlinesNoFade"
                 android:label="Underlines/No Fade">
         </activity>
-        <activity android:name="org.evergreen.android.searchCatalog.MoreCopyInformation">
+        <activity android:name="org.evergreen_ils.searchCatalog.MoreCopyInformation">
         </activity>
-        <activity android:name="org.evergreen.android.searchCatalog.SearchCatalogListView">
+        <activity android:name="org.evergreen_ils.searchCatalog.SearchCatalogListView">
         </activity>
-        <activity android:name="org.evergreen.android.searchCatalog.AdvancedSearchActivity">
+        <activity android:name="org.evergreen_ils.searchCatalog.AdvancedSearchActivity">
         </activity>
         <activity
-                android:name="org.evergreen.android.barcodescan.CaptureActivity"
+                android:name="org.evergreen_ils.barcodescan.CaptureActivity"
                 android:screenOrientation="landscape"
                 android:theme="@android:style/Theme.NoTitleBar"
                 android:windowSoftInputMode="stateAlwaysHidden">
         </activity>
 
         <!-- Checkout Activities -->
-        <activity android:name="org.evergreen.android.accountAccess.checkout.ItemsCheckOutListView">
+        <activity android:name="org.evergreen_ils.accountAccess.checkout.ItemsCheckOutListView">
         </activity>
 
         <!-- Holds Activities -->
-        <activity android:name="org.evergreen.android.accountAccess.holds.HoldsListView">
+        <activity android:name="org.evergreen_ils.accountAccess.holds.HoldsListView">
         </activity>
-        <activity android:name="org.evergreen.android.accountAccess.holds.PlaceHold">
+        <activity android:name="org.evergreen_ils.accountAccess.holds.PlaceHold">
         </activity>
-        <activity android:name="org.evergreen.android.accountAccess.holds.HoldDetails">
+        <activity android:name="org.evergreen_ils.accountAccess.holds.HoldDetails">
         </activity>
 
         <!-- Fines Activities -->
-        <activity android:name="org.evergreen.android.accountAccess.fines.FinesActivity">
+        <activity android:name="org.evergreen_ils.accountAccess.fines.FinesActivity">
         </activity>
 
         <!-- Bookbags -->
-        <activity android:name="org.evergreen.android.accountAccess.bookbags.BookbagsListView">
+        <activity android:name="org.evergreen_ils.accountAccess.bookbags.BookbagsListView">
         </activity>
-        <activity android:name="org.evergreen.android.accountAccess.bookbags.BookBagDetails">
+        <activity android:name="org.evergreen_ils.accountAccess.bookbags.BookBagDetails">
         </activity>
 
         <activity
-- 
2.11.0