commit e3c22ba35cd6fd453f600ffe78a7dd6677dc2618
author Rajan Maurya <rajanmaurya154@gmail.com> Tue Sep 05 11:51:40 2017 +0530
committer Rajan Maurya <rajanmaurya154@gmail.com> Tue Sep 05 11:51:40 2017 +0530
tree 53c3bbe8344898ddb5d0c6c8a85986a6c1e48500
parent 5b84e211b3ab554f2e4a2226e3c8e9cc2b73f640

refactor: package name to org.apache.fineract

app/build.gradle

diff --git a/app/build.gradle b/app/build.gradle
index 5fefc17..63ee78d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@
     buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        applicationId "com.mifos.apache.fineract"
+        applicationId "org.apache.fineract"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1

app/src/androidTest/java/org/apache/fineract/ExampleInstrumentedTest.java

diff --git a/app/src/androidTest/java/com/mifos/apache/fineract/ExampleInstrumentedTest.java b/app/src/androidTest/java/org/apache/fineract/ExampleInstrumentedTest.java
similarity index 95%
rename from app/src/androidTest/java/com/mifos/apache/fineract/ExampleInstrumentedTest.java
rename to app/src/androidTest/java/org/apache/fineract/ExampleInstrumentedTest.java
index 20e6aa4..11f0609 100644
--- a/app/src/androidTest/java/com/mifos/apache/fineract/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/org/apache/fineract/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract;
+package org.apache.fineract;
 
 import static junit.framework.Assert.assertEquals;
 

app/src/commonTest/java/org/apache/fineract/FakeJsonName.java

diff --git a/app/src/commonTest/java/com/mifos/apache/fineract/FakeJsonName.java b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
similarity index 78%
rename from app/src/commonTest/java/com/mifos/apache/fineract/FakeJsonName.java
rename to app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
index 38257dd..0c4e7b8 100644
--- a/app/src/commonTest/java/com/mifos/apache/fineract/FakeJsonName.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract;
+package org.apache.fineract;
 
 /**
  * This class contains the Fake data json file names.

app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java

diff --git a/app/src/commonTest/java/com/mifos/apache/fineract/FakeRemoteDataSource.java b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
similarity index 87%
rename from app/src/commonTest/java/com/mifos/apache/fineract/FakeRemoteDataSource.java
rename to app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
index fffe79c..4f92f80 100644
--- a/app/src/commonTest/java/com/mifos/apache/fineract/FakeRemoteDataSource.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract;
+package org.apache.fineract;
 
 /**
  * FakeRemoteDataSource is reading the local json files into the java object using gson.

app/src/commonTest/java/org/apache/fineract/TestDataFactory.java

diff --git a/app/src/commonTest/java/com/mifos/apache/fineract/TestDataFactory.java b/app/src/commonTest/java/org/apache/fineract/TestDataFactory.java
similarity index 98%
rename from app/src/commonTest/java/com/mifos/apache/fineract/TestDataFactory.java
rename to app/src/commonTest/java/org/apache/fineract/TestDataFactory.java
index ed385dd..16c2fdc 100644
--- a/app/src/commonTest/java/com/mifos/apache/fineract/TestDataFactory.java
+++ b/app/src/commonTest/java/org/apache/fineract/TestDataFactory.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract;
+package org.apache.fineract;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;

app/src/main/AndroidManifest.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4937107..0679430 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.mifos.apache.fineract">
+          package="org.apache.fineract">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA"/>
@@ -20,7 +20,7 @@
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.mifos.apache.fineract.fileprovider"
+            android:authorities="org.apache.fineract.fileprovider"
             android:grantUriPermissions="true"
             android:exported="false">
             <meta-data
@@ -44,11 +44,11 @@
 
         <activity android:name=".ui.online.depositaccounts.depositaccountslist.DepositAccountsActivity" />
 
-        <activity android:name="com.mifos.apache.fineract.ui.online.loanaccounts.loanaccountlist.LoanAccountsActivity" />
+        <activity android:name=".ui.online.loanaccounts.loanaccountlist.LoanAccountsActivity" />
 
         <activity android:name=".ui.online.loanaccounts.plannedpayment.PlannedPaymentActivity" />
 
-        <activity android:name="com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loanactivity.LoanApplicationActivity" />
+        <activity android:name=".ui.online.loanaccounts.loanapplication.loanactivity.LoanApplicationActivity" />
 
         <activity android:name=".ui.online.customers.createcustomer.customeractivity.CreateCustomerActivity" />
 

app/src/main/java/com/mifos/apache/fineract/data/models/deposit/TimeUnit.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/TimeUnit.java b/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/TimeUnit.java
deleted file mode 100644
index df04046..0000000
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/TimeUnit.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.mifos.apache.fineract.data.models.deposit;
-
-public enum TimeUnit {
-
-    MONTH,
-
-    YEAR
-
-}
\ No newline at end of file

app/src/main/java/com/mifos/apache/fineract/data/models/deposit/Type.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/Type.java b/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/Type.java
deleted file mode 100644
index b1ef8fb..0000000
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/Type.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.mifos.apache.fineract.data.models.deposit;
-
-public enum Type {
-
-    CHECKING,
-
-    SAVINGS,
-
-    SHARE
-
-}
\ No newline at end of file

app/src/main/java/com/mifos/apache/fineract/injection/component/ActivityComponent.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/injection/component/ActivityComponent.java b/app/src/main/java/com/mifos/apache/fineract/injection/component/ActivityComponent.java
deleted file mode 100644
index 277ca5e..0000000
--- a/app/src/main/java/com/mifos/apache/fineract/injection/component/ActivityComponent.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.mifos.apache.fineract.injection.component;
-
-import com.mifos.apache.fineract.injection.PerActivity;
-import com.mifos.apache.fineract.injection.module.ActivityModule;
-import com.mifos.apache.fineract.ui.online.DashboardActivity;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.customeractivity.CreateCustomerActivity;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.formcustomeraddress.FormCustomerAddressFragment;
-
-import com.mifos.apache.fineract.ui.online.customers.customeractivities.CustomerActivitiesFragment;
-import com.mifos.apache.fineract.ui.online.customers.customerlist.CustomersFragment;
-import com.mifos.apache.fineract.ui.online.customers.customerprofile
-        .editcustomerprofilebottomsheet.EditCustomerProfileBottomSheet;
-import com.mifos.apache.fineract.ui.online.customers.customertasks.CustomerTasksBottomSheetFragment;
-import com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount.FormDepositOverviewFragment;
-
-import com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount.createdepositactivity
-        .CreateDepositActivity;
-import com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount.formdepositassignproduct
-        .FormDepositAssignProductFragment;
-import com.mifos.apache.fineract.ui.online.depositaccounts.depositaccountslist.DepositAccountsFragment;
-import com.mifos.apache.fineract.ui.online.customers.customerdetails.CustomerDetailsFragment;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loanaccountlist.LoanAccountsFragment;
-import com.mifos.apache.fineract.ui.online.loanaccounts.debtincomereport.DebtIncomeReportFragment;
-import com.mifos.apache.fineract.ui.online.depositaccounts.depositaccountdetails.DepositAccountDetailsFragment;
-import com.mifos.apache.fineract.ui.online.identification.createidentification.identificationactivity.CreateIdentificationActivity;
-import com.mifos.apache.fineract.ui.online.identification.identificationdetails.IdentificationDetailsFragment;
-import com.mifos.apache.fineract.ui.online.identification.identificationlist.IdentificationsFragment;
-import com.mifos.apache.fineract.ui.online.identification.uploadidentificationscan.UploadIdentificationCardBottomSheet;
-import com.mifos.apache.fineract.ui.online.launcher.LauncherActivity;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.BaseFragmentDebtIncome;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loanactivity.LoanApplicationActivity;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loancosigner.LoanCoSignerFragment;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loandetails.LoanDetailsFragment;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loandetails.CustomerLoanDetailsFragment;
-import com.mifos.apache.fineract.ui.online.login.LoginActivity;
-import com.mifos.apache.fineract.ui.online.loanaccounts.plannedpayment.PlannedPaymentFragment;
-import com.mifos.apache.fineract.ui.online.roles.roleslist.RolesFragment;
-
-import dagger.Subcomponent;
-
-/**
- * This component inject dependencies to all Activities across the application
- */
-@PerActivity
-@Subcomponent(modules = ActivityModule.class)
-public interface ActivityComponent {
-
-    void inject(LoginActivity loginActivity);
-
-    void inject(LauncherActivity launcherActivity);
-
-    void inject(CustomersFragment customersFragment);
-
-    void inject(CustomerDetailsFragment customerDetailsFragment);
-
-    void inject(DepositAccountsFragment customerDepositFragment);
-
-    void inject(LoanAccountsFragment customerLoansFragment);
-
-    void inject(CustomerLoanDetailsFragment customerLoanDetailsFragment);
-
-    void inject(DepositAccountDetailsFragment customerDepositDetailsFragment);
-
-    void inject(PlannedPaymentFragment plannedPaymentFragment);
-
-    void inject(LoanApplicationActivity loanApplicationActivity);
-
-    void inject(LoanDetailsFragment loanDetailsFragment);
-
-    void inject(BaseFragmentDebtIncome loanDebtIncomeFragment);
-
-    void inject(LoanCoSignerFragment loanCoSignerFragment);
-
-    void inject(CreateCustomerActivity createCustomerActivity);
-
-    void inject(FormCustomerAddressFragment formCustomerAddressFragment);
-
-    void inject(CustomerTasksBottomSheetFragment tasksBottomSheetFragment);
-
-    void inject(DebtIncomeReportFragment debtIncomeReportFragment);
-
-    void inject(IdentificationsFragment identificationsFragment);
-
-    void inject(CreateIdentificationActivity createIdentificationActivity);
-
-    void inject(IdentificationDetailsFragment identificationDetailsFragment);
-
-    void inject(UploadIdentificationCardBottomSheet uploadIdentificationCardBottomSheet);
-
-    void inject(EditCustomerProfileBottomSheet editCustomerProfileBottomSheet);
-
-    void inject(FormDepositAssignProductFragment formDepositAssignProductFragment);
-
-    void inject(FormDepositOverviewFragment formDepositOverviewFragment);
-
-    void inject(CreateDepositActivity createDepositActivity);
-
-    void inject(CustomerActivitiesFragment customerActivitiesFragment);
-
-    void inject(DashboardActivity dashboardActivity);
-
-    void inject(RolesFragment rolesFragment);
-}

app/src/main/java/com/mifos/apache/fineract/injection/component/ApplicationComponent.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/injection/component/ApplicationComponent.java b/app/src/main/java/com/mifos/apache/fineract/injection/component/ApplicationComponent.java
deleted file mode 100644
index a546b6f..0000000
--- a/app/src/main/java/com/mifos/apache/fineract/injection/component/ApplicationComponent.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.mifos.apache.fineract.injection.component;
-
-import android.app.Application;
-import android.content.Context;
-
-import com.mifos.apache.fineract.MifosApplication;
-import com.mifos.apache.fineract.data.datamanager.DataManagerAnonymous;
-import com.mifos.apache.fineract.data.datamanager.DataManagerAuth;
-import com.mifos.apache.fineract.data.datamanager.DataManagerCustomer;
-import com.mifos.apache.fineract.data.datamanager.DataManagerDeposit;
-import com.mifos.apache.fineract.data.datamanager.DataManagerIndividualLending;
-import com.mifos.apache.fineract.data.datamanager.DataManagerLoans;
-import com.mifos.apache.fineract.data.datamanager.DataManagerRoles;
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
-import com.mifos.apache.fineract.data.remote.BaseApiManager;
-import com.mifos.apache.fineract.data.remote.MifosInterceptor;
-import com.mifos.apache.fineract.data.remote.ReceivedCookiesInterceptor;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.module.ApplicationModule;
-
-import javax.inject.Singleton;
-
-import dagger.Component;
-
-@Singleton
-@Component(modules = ApplicationModule.class)
-public interface ApplicationComponent {
-
-    @ApplicationContext
-    Context context();
-    Application application();
-    DataManagerAuth dataManager();
-    DataManagerCustomer dataManagerCustomer();
-    DataManagerDeposit dataManagerDeposit();
-    DataManagerLoans dataManagerLoans();
-    DataManagerIndividualLending dataManagerIndividualLending();
-    DataManagerAnonymous dataManagerAnonymous();
-    DataManagerRoles dataManagerRolesAndPermissions();
-    BaseApiManager baseApiManager();
-    PreferencesHelper preferencesHelper();
-
-    void inject(MifosInterceptor mifosInterceptor);
-    void inject(MifosApplication mifosApplication);
-
-    void inject(ReceivedCookiesInterceptor receivedCookiesInterceptor);
-
-}

app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditAction.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditAction.java b/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditAction.java
deleted file mode 100644
index 627c032..0000000
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditAction.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mifos.apache.fineract.ui.online.customers.customerprofile.editcustomerprofilebottomsheet;
-
-/**
- * @author Rajan Maurya
- *         On 07/08/17.
- */
-public enum  EditAction {
-
-    CAMERA,
-
-    GALLERY,
-
-    DELETE
-}

app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customertasks/OnTasksChangeListener.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customertasks/OnTasksChangeListener.java b/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customertasks/OnTasksChangeListener.java
deleted file mode 100644
index a2b00eb..0000000
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customertasks/OnTasksChangeListener.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.mifos.apache.fineract.ui.online.customers.customertasks;
-
-import com.mifos.apache.fineract.data.models.customer.Customer;
-
-/**
- * @author Rajan Maurya
- *         On 18/08/17.
- */
-public interface OnTasksChangeListener {
-
-    void changeCustomerStatus(Customer.State state);
-}

app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositAction.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositAction.java b/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositAction.java
deleted file mode 100644
index 7342436..0000000
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositAction.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount;
-
-/**
- * @author Rajan Maurya
- *         On 13/08/17.
- */
-public enum DepositAction {
-
-    CREATE,
-
-    EDIT
-}

app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOverViewContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOverViewContract.java b/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOverViewContract.java
deleted file mode 100644
index 46adc90..0000000
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOverViewContract.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount;
-
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-
-/**
- * @author Rajan Maurya
- *         On 15/08/17.
- */
-public interface DepositOverViewContract {
-
-    void setProductInstance(DepositAccount depositAccount, String productName,
-            DepositAction depositAction);
-}

app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/Action.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/Action.java b/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/Action.java
deleted file mode 100644
index a655003..0000000
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/Action.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.mifos.apache.fineract.ui.online.identification.createidentification;
-
-/**
- * @author Rajan Maurya
- *         On 04/08/17.
- */
-public enum  Action {
-
-    CREATE,
-
-    EDIT
-}

app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/OnNavigationBarListener.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/OnNavigationBarListener.java b/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/OnNavigationBarListener.java
deleted file mode 100644
index a36440c..0000000
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/OnNavigationBarListener.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.mifos.apache.fineract.ui.online.identification.createidentification;
-
-
-import com.mifos.apache.fineract.data.models.customer.identification.Identification;
-
-/**
- * @author Rajan Maurya
- *         On 17/07/17.
- */
-public interface OnNavigationBarListener {
-
-    interface IdentificationCard {
-        void setIdentificationDetails(Identification identificationDetails);
-    }
-}

app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/OverViewContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/OverViewContract.java b/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/OverViewContract.java
deleted file mode 100644
index 7b73c6e..0000000
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/OverViewContract.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.mifos.apache.fineract.ui.online.identification.createidentification;
-
-import com.mifos.apache.fineract.data.models.customer.identification.Identification;
-
-/**
- * @author Rajan Maurya
- *         On 31/07/17.
- */
-public interface OverViewContract {
-
-    void setIdentification(Identification identification);
-}

app/src/main/java/org/apache/fineract/MifosApplication.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/MifosApplication.java b/app/src/main/java/org/apache/fineract/MifosApplication.java
similarity index 83%
rename from app/src/main/java/com/mifos/apache/fineract/MifosApplication.java
rename to app/src/main/java/org/apache/fineract/MifosApplication.java
index a8d6daf..f8870c0 100644
--- a/app/src/main/java/com/mifos/apache/fineract/MifosApplication.java
+++ b/app/src/main/java/org/apache/fineract/MifosApplication.java
@@ -1,12 +1,13 @@
-package com.mifos.apache.fineract;
+package org.apache.fineract;
 
 import android.app.Application;
 import android.content.Context;
 
 import com.crashlytics.android.Crashlytics;
-import com.mifos.apache.fineract.injection.component.ApplicationComponent;
-import com.mifos.apache.fineract.injection.component.DaggerApplicationComponent;
-import com.mifos.apache.fineract.injection.module.ApplicationModule;
+
+import org.apache.fineract.injection.component.ApplicationComponent;
+import org.apache.fineract.injection.component.DaggerApplicationComponent;
+import org.apache.fineract.injection.module.ApplicationModule;
 
 import io.fabric.sdk.android.Fabric;
 

app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAnonymous.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerAnonymous.java b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAnonymous.java
similarity index 74%
rename from app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerAnonymous.java
rename to app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAnonymous.java
index 5cabf6e..8f3f383 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerAnonymous.java
+++ b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAnonymous.java
@@ -1,8 +1,8 @@
-package com.mifos.apache.fineract.data.datamanager;
+package org.apache.fineract.data.datamanager;
 
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
-import com.mifos.apache.fineract.data.models.customer.Country;
-import com.mifos.apache.fineract.data.remote.BaseApiManager;
+import org.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.data.models.customer.Country;
+import org.apache.fineract.data.remote.BaseApiManager;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAuth.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerAuth.java b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAuth.java
similarity index 81%
rename from app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerAuth.java
rename to app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAuth.java
index 58cdb4d..ddfbb88 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerAuth.java
+++ b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAuth.java
@@ -1,10 +1,10 @@
-package com.mifos.apache.fineract.data.datamanager;
+package org.apache.fineract.data.datamanager;
 
 import android.util.Base64;
 
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
-import com.mifos.apache.fineract.data.models.Authentication;
-import com.mifos.apache.fineract.data.remote.BaseApiManager;
+import org.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.data.models.Authentication;
+import org.apache.fineract.data.remote.BaseApiManager;
 
 import java.nio.charset.Charset;
 

app/src/main/java/org/apache/fineract/data/datamanager/DataManagerCustomer.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerCustomer.java b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerCustomer.java
similarity index 89%
rename from app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerCustomer.java
rename to app/src/main/java/org/apache/fineract/data/datamanager/DataManagerCustomer.java
index 8e5798e..5c1ce41 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerCustomer.java
+++ b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerCustomer.java
@@ -1,12 +1,12 @@
-package com.mifos.apache.fineract.data.datamanager;
+package org.apache.fineract.data.datamanager;
 
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
-import com.mifos.apache.fineract.data.models.customer.Command;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.data.models.customer.CustomerPage;
-import com.mifos.apache.fineract.data.models.customer.identification.Identification;
-import com.mifos.apache.fineract.data.models.customer.identification.ScanCard;
-import com.mifos.apache.fineract.data.remote.BaseApiManager;
+import org.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.data.models.customer.Command;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.data.models.customer.CustomerPage;
+import org.apache.fineract.data.models.customer.identification.Identification;
+import org.apache.fineract.data.models.customer.identification.ScanCard;
+import org.apache.fineract.data.remote.BaseApiManager;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/data/datamanager/DataManagerDeposit.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerDeposit.java b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerDeposit.java
similarity index 85%
rename from app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerDeposit.java
rename to app/src/main/java/org/apache/fineract/data/datamanager/DataManagerDeposit.java
index e4a0b3c..95c6602 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerDeposit.java
+++ b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerDeposit.java
@@ -1,9 +1,9 @@
-package com.mifos.apache.fineract.data.datamanager;
+package org.apache.fineract.data.datamanager;
 
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.data.models.deposit.ProductDefinition;
-import com.mifos.apache.fineract.data.remote.BaseApiManager;
+import org.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.data.models.deposit.ProductDefinition;
+import org.apache.fineract.data.remote.BaseApiManager;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/data/datamanager/DataManagerIndividualLending.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerIndividualLending.java b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerIndividualLending.java
similarity index 81%
rename from app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerIndividualLending.java
rename to app/src/main/java/org/apache/fineract/data/datamanager/DataManagerIndividualLending.java
index 2738595..97320fe 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerIndividualLending.java
+++ b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerIndividualLending.java
@@ -1,8 +1,8 @@
-package com.mifos.apache.fineract.data.datamanager;
+package org.apache.fineract.data.datamanager;
 
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
-import com.mifos.apache.fineract.data.models.payment.PlannedPaymentPage;
-import com.mifos.apache.fineract.data.remote.BaseApiManager;
+import org.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.data.models.payment.PlannedPaymentPage;
+import org.apache.fineract.data.remote.BaseApiManager;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

app/src/main/java/org/apache/fineract/data/datamanager/DataManagerLoans.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerLoans.java b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerLoans.java
similarity index 81%
rename from app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerLoans.java
rename to app/src/main/java/org/apache/fineract/data/datamanager/DataManagerLoans.java
index e143f6c..1e28a28 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerLoans.java
+++ b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerLoans.java
@@ -1,10 +1,10 @@
-package com.mifos.apache.fineract.data.datamanager;
+package org.apache.fineract.data.datamanager;
 
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
-import com.mifos.apache.fineract.data.models.loan.LoanAccount;
-import com.mifos.apache.fineract.data.models.loan.LoanAccountPage;
-import com.mifos.apache.fineract.data.models.product.ProductPage;
-import com.mifos.apache.fineract.data.remote.BaseApiManager;
+import org.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.data.models.loan.LoanAccount;
+import org.apache.fineract.data.models.loan.LoanAccountPage;
+import org.apache.fineract.data.models.product.ProductPage;
+import org.apache.fineract.data.remote.BaseApiManager;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

app/src/main/java/org/apache/fineract/data/datamanager/DataManagerRoles.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerRoles.java b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerRoles.java
similarity index 77%
rename from app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerRoles.java
rename to app/src/main/java/org/apache/fineract/data/datamanager/DataManagerRoles.java
index e1ea804..59f03dc 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/DataManagerRoles.java
+++ b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerRoles.java
@@ -1,8 +1,8 @@
-package com.mifos.apache.fineract.data.datamanager;
+package org.apache.fineract.data.datamanager;
 
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
-import com.mifos.apache.fineract.data.models.rolesandpermission.Role;
-import com.mifos.apache.fineract.data.remote.BaseApiManager;
+import org.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.data.models.rolesandpermission.Role;
+import org.apache.fineract.data.remote.BaseApiManager;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/data/datamanager/MifosBaseDataManager.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/MifosBaseDataManager.java b/app/src/main/java/org/apache/fineract/data/datamanager/MifosBaseDataManager.java
similarity index 92%
rename from app/src/main/java/com/mifos/apache/fineract/data/datamanager/MifosBaseDataManager.java
rename to app/src/main/java/org/apache/fineract/data/datamanager/MifosBaseDataManager.java
index 5a1f963..28211ab 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/datamanager/MifosBaseDataManager.java
+++ b/app/src/main/java/org/apache/fineract/data/datamanager/MifosBaseDataManager.java
@@ -1,9 +1,9 @@
-package com.mifos.apache.fineract.data.datamanager;
+package org.apache.fineract.data.datamanager;
 
-import com.mifos.apache.fineract.data.local.PreferenceKey;
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
-import com.mifos.apache.fineract.data.models.Authentication;
-import com.mifos.apache.fineract.exceptions.ExceptionStatusCode;
+import org.apache.fineract.data.local.PreferenceKey;
+import org.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.data.models.Authentication;
+import org.apache.fineract.exceptions.ExceptionStatusCode;
 
 import io.reactivex.Completable;
 import io.reactivex.CompletableSource;

app/src/main/java/org/apache/fineract/data/local/PreferenceKey.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/local/PreferenceKey.java b/app/src/main/java/org/apache/fineract/data/local/PreferenceKey.java
similarity index 93%
rename from app/src/main/java/com/mifos/apache/fineract/data/local/PreferenceKey.java
rename to app/src/main/java/org/apache/fineract/data/local/PreferenceKey.java
index c58a724..78d4b3b 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/local/PreferenceKey.java
+++ b/app/src/main/java/org/apache/fineract/data/local/PreferenceKey.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.local;
+package org.apache.fineract.data.local;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/data/local/PreferencesHelper.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/local/PreferencesHelper.java b/app/src/main/java/org/apache/fineract/data/local/PreferencesHelper.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/data/local/PreferencesHelper.java
rename to app/src/main/java/org/apache/fineract/data/local/PreferencesHelper.java
index acc1a7c..3ab9593 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/local/PreferencesHelper.java
+++ b/app/src/main/java/org/apache/fineract/data/local/PreferencesHelper.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.local;
+package org.apache.fineract.data.local;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -6,8 +6,8 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.mifos.apache.fineract.data.models.Authentication;
-import com.mifos.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.data.models.Authentication;
+import org.apache.fineract.injection.ApplicationContext;
 
 import java.util.Set;
 

app/src/main/java/org/apache/fineract/data/models/Authentication.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/Authentication.java b/app/src/main/java/org/apache/fineract/data/models/Authentication.java
similarity index 98%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/Authentication.java
rename to app/src/main/java/org/apache/fineract/data/models/Authentication.java
index 3cf4e56..f06582c 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/Authentication.java
+++ b/app/src/main/java/org/apache/fineract/data/models/Authentication.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models;
+package org.apache.fineract.data.models;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/org/apache/fineract/data/models/State.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/State.java b/app/src/main/java/org/apache/fineract/data/models/State.java
similarity index 87%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/State.java
rename to app/src/main/java/org/apache/fineract/data/models/State.java
index def0708..23429e8 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/State.java
+++ b/app/src/main/java/org/apache/fineract/data/models/State.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models;
+package org.apache.fineract.data.models;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/data/models/customer/Address.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/Address.java b/app/src/main/java/org/apache/fineract/data/models/customer/Address.java
similarity index 97%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/customer/Address.java
rename to app/src/main/java/org/apache/fineract/data/models/customer/Address.java
index 02d7cbe..7f618cc 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/Address.java
+++ b/app/src/main/java/org/apache/fineract/data/models/customer/Address.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.customer;
+package org.apache.fineract.data.models.customer;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/org/apache/fineract/data/models/customer/Command.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/Command.java b/app/src/main/java/org/apache/fineract/data/models/customer/Command.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/customer/Command.java
rename to app/src/main/java/org/apache/fineract/data/models/customer/Command.java
index 87ff489..6faf9bb 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/Command.java
+++ b/app/src/main/java/org/apache/fineract/data/models/customer/Command.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.customer;
+package org.apache.fineract.data.models.customer;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/org/apache/fineract/data/models/customer/ContactDetail.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/ContactDetail.java b/app/src/main/java/org/apache/fineract/data/models/customer/ContactDetail.java
similarity index 97%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/customer/ContactDetail.java
rename to app/src/main/java/org/apache/fineract/data/models/customer/ContactDetail.java
index 6d0865a..0cf53d8 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/ContactDetail.java
+++ b/app/src/main/java/org/apache/fineract/data/models/customer/ContactDetail.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.customer;
+package org.apache.fineract.data.models.customer;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/org/apache/fineract/data/models/customer/Country.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/Country.java b/app/src/main/java/org/apache/fineract/data/models/customer/Country.java
similarity index 93%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/customer/Country.java
rename to app/src/main/java/org/apache/fineract/data/models/customer/Country.java
index 2faa1a2..d8548db 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/Country.java
+++ b/app/src/main/java/org/apache/fineract/data/models/customer/Country.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.customer;
+package org.apache.fineract.data.models.customer;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/org/apache/fineract/data/models/customer/Customer.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/Customer.java b/app/src/main/java/org/apache/fineract/data/models/customer/Customer.java
similarity index 98%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/customer/Customer.java
rename to app/src/main/java/org/apache/fineract/data/models/customer/Customer.java
index fe8953a..d0ee00b 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/Customer.java
+++ b/app/src/main/java/org/apache/fineract/data/models/customer/Customer.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.customer;
+package org.apache.fineract.data.models.customer;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/org/apache/fineract/data/models/customer/CustomerPage.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/CustomerPage.java b/app/src/main/java/org/apache/fineract/data/models/customer/CustomerPage.java
similarity index 92%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/customer/CustomerPage.java
rename to app/src/main/java/org/apache/fineract/data/models/customer/CustomerPage.java
index 3738498..ac1f79c 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/CustomerPage.java
+++ b/app/src/main/java/org/apache/fineract/data/models/customer/CustomerPage.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.customer;
+package org.apache.fineract.data.models.customer;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/data/models/customer/DateOfBirth.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/DateOfBirth.java b/app/src/main/java/org/apache/fineract/data/models/customer/DateOfBirth.java
similarity index 96%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/customer/DateOfBirth.java
rename to app/src/main/java/org/apache/fineract/data/models/customer/DateOfBirth.java
index 8ae5e6a..6d4a872 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/DateOfBirth.java
+++ b/app/src/main/java/org/apache/fineract/data/models/customer/DateOfBirth.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.customer;
+package org.apache.fineract.data.models.customer;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/org/apache/fineract/data/models/customer/Translations.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/Translations.java b/app/src/main/java/org/apache/fineract/data/models/customer/Translations.java
similarity index 77%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/customer/Translations.java
rename to app/src/main/java/org/apache/fineract/data/models/customer/Translations.java
index 275945a..8f387db 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/Translations.java
+++ b/app/src/main/java/org/apache/fineract/data/models/customer/Translations.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.customer;
+package org.apache.fineract.data.models.customer;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/data/models/customer/identification/ExpirationDate.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/identification/ExpirationDate.java b/app/src/main/java/org/apache/fineract/data/models/customer/identification/ExpirationDate.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/customer/identification/ExpirationDate.java
rename to app/src/main/java/org/apache/fineract/data/models/customer/identification/ExpirationDate.java
index 08ad71c..5604ba6 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/identification/ExpirationDate.java
+++ b/app/src/main/java/org/apache/fineract/data/models/customer/identification/ExpirationDate.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.customer.identification;
+package org.apache.fineract.data.models.customer.identification;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/org/apache/fineract/data/models/customer/identification/Identification.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/identification/Identification.java b/app/src/main/java/org/apache/fineract/data/models/customer/identification/Identification.java
similarity index 97%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/customer/identification/Identification.java
rename to app/src/main/java/org/apache/fineract/data/models/customer/identification/Identification.java
index 5a7bc8e..4816f59 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/identification/Identification.java
+++ b/app/src/main/java/org/apache/fineract/data/models/customer/identification/Identification.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.customer.identification;
+package org.apache.fineract.data.models.customer.identification;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/org/apache/fineract/data/models/customer/identification/ScanCard.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/identification/ScanCard.java b/app/src/main/java/org/apache/fineract/data/models/customer/identification/ScanCard.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/customer/identification/ScanCard.java
rename to app/src/main/java/org/apache/fineract/data/models/customer/identification/ScanCard.java
index 2b73f29..c8617b3 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/customer/identification/ScanCard.java
+++ b/app/src/main/java/org/apache/fineract/data/models/customer/identification/ScanCard.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.customer.identification;
+package org.apache.fineract.data.models.customer.identification;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/org/apache/fineract/data/models/deposit/Charge.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/Charge.java b/app/src/main/java/org/apache/fineract/data/models/deposit/Charge.java
similarity index 96%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/deposit/Charge.java
rename to app/src/main/java/org/apache/fineract/data/models/deposit/Charge.java
index 62e2665..b457e48 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/Charge.java
+++ b/app/src/main/java/org/apache/fineract/data/models/deposit/Charge.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.deposit;
+package org.apache.fineract.data.models.deposit;
 
 public class Charge {
 

app/src/main/java/org/apache/fineract/data/models/deposit/Currency.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/Currency.java b/app/src/main/java/org/apache/fineract/data/models/deposit/Currency.java
similarity index 92%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/deposit/Currency.java
rename to app/src/main/java/org/apache/fineract/data/models/deposit/Currency.java
index 3941f1b..376c751 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/Currency.java
+++ b/app/src/main/java/org/apache/fineract/data/models/deposit/Currency.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.deposit;
+package org.apache.fineract.data.models.deposit;
 
 public class Currency {
 

app/src/main/java/org/apache/fineract/data/models/deposit/DepositAccount.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/DepositAccount.java b/app/src/main/java/org/apache/fineract/data/models/deposit/DepositAccount.java
similarity index 98%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/deposit/DepositAccount.java
rename to app/src/main/java/org/apache/fineract/data/models/deposit/DepositAccount.java
index 0e96995..8b8cb47 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/DepositAccount.java
+++ b/app/src/main/java/org/apache/fineract/data/models/deposit/DepositAccount.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.deposit;
+package org.apache.fineract.data.models.deposit;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/org/apache/fineract/data/models/deposit/InterestPayable.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/InterestPayable.java b/app/src/main/java/org/apache/fineract/data/models/deposit/InterestPayable.java
similarity index 62%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/deposit/InterestPayable.java
rename to app/src/main/java/org/apache/fineract/data/models/deposit/InterestPayable.java
index 40c46dc..0f18d80 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/InterestPayable.java
+++ b/app/src/main/java/org/apache/fineract/data/models/deposit/InterestPayable.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.deposit;
+package org.apache.fineract.data.models.deposit;
 
 public enum InterestPayable {
 

app/src/main/java/org/apache/fineract/data/models/deposit/ProductDefinition.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/ProductDefinition.java b/app/src/main/java/org/apache/fineract/data/models/deposit/ProductDefinition.java
similarity index 98%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/deposit/ProductDefinition.java
rename to app/src/main/java/org/apache/fineract/data/models/deposit/ProductDefinition.java
index 936de14..eae6030 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/ProductDefinition.java
+++ b/app/src/main/java/org/apache/fineract/data/models/deposit/ProductDefinition.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.deposit;
+package org.apache.fineract.data.models.deposit;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/data/models/deposit/Term.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/Term.java b/app/src/main/java/org/apache/fineract/data/models/deposit/Term.java
similarity index 93%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/deposit/Term.java
rename to app/src/main/java/org/apache/fineract/data/models/deposit/Term.java
index 9ea7c21..45d93b3 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/deposit/Term.java
+++ b/app/src/main/java/org/apache/fineract/data/models/deposit/Term.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.deposit;
+package org.apache.fineract.data.models.deposit;
 
 
 public class Term {

app/src/main/java/org/apache/fineract/data/models/deposit/TimeUnit.java

diff --git a/app/src/main/java/org/apache/fineract/data/models/deposit/TimeUnit.java b/app/src/main/java/org/apache/fineract/data/models/deposit/TimeUnit.java
new file mode 100644
index 0000000..1e6b74c
--- /dev/null
+++ b/app/src/main/java/org/apache/fineract/data/models/deposit/TimeUnit.java
@@ -0,0 +1,9 @@
+package org.apache.fineract.data.models.deposit;
+
+public enum TimeUnit {
+
+    MONTH,
+
+    YEAR
+
+}
\ No newline at end of file

app/src/main/java/org/apache/fineract/data/models/deposit/Type.java

diff --git a/app/src/main/java/org/apache/fineract/data/models/deposit/Type.java b/app/src/main/java/org/apache/fineract/data/models/deposit/Type.java
new file mode 100644
index 0000000..c4ac5c1
--- /dev/null
+++ b/app/src/main/java/org/apache/fineract/data/models/deposit/Type.java
@@ -0,0 +1,11 @@
+package org.apache.fineract.data.models.deposit;
+
+public enum Type {
+
+    CHECKING,
+
+    SAVINGS,
+
+    SHARE
+
+}
\ No newline at end of file

app/src/main/java/org/apache/fineract/data/models/error/MifosError.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/error/MifosError.java b/app/src/main/java/org/apache/fineract/data/models/error/MifosError.java
similarity index 97%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/error/MifosError.java
rename to app/src/main/java/org/apache/fineract/data/models/error/MifosError.java
index 82dc13d..2348548 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/error/MifosError.java
+++ b/app/src/main/java/org/apache/fineract/data/models/error/MifosError.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.error;
+package org.apache.fineract.data.models.error;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/org/apache/fineract/data/models/loan/AccountAssignment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/AccountAssignment.java b/app/src/main/java/org/apache/fineract/data/models/loan/AccountAssignment.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/loan/AccountAssignment.java
rename to app/src/main/java/org/apache/fineract/data/models/loan/AccountAssignment.java
index b2a07a6..d141e2a 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/AccountAssignment.java
+++ b/app/src/main/java/org/apache/fineract/data/models/loan/AccountAssignment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.loan;
+package org.apache.fineract.data.models.loan;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/data/models/loan/CreditWorthinessFactor.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/CreditWorthinessFactor.java b/app/src/main/java/org/apache/fineract/data/models/loan/CreditWorthinessFactor.java
similarity index 96%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/loan/CreditWorthinessFactor.java
rename to app/src/main/java/org/apache/fineract/data/models/loan/CreditWorthinessFactor.java
index e13dec0..8990a2f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/CreditWorthinessFactor.java
+++ b/app/src/main/java/org/apache/fineract/data/models/loan/CreditWorthinessFactor.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.loan;
+package org.apache.fineract.data.models.loan;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/org/apache/fineract/data/models/loan/CreditWorthinessSnapshot.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/CreditWorthinessSnapshot.java b/app/src/main/java/org/apache/fineract/data/models/loan/CreditWorthinessSnapshot.java
similarity index 97%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/loan/CreditWorthinessSnapshot.java
rename to app/src/main/java/org/apache/fineract/data/models/loan/CreditWorthinessSnapshot.java
index 1b30a2c..1fbf557 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/CreditWorthinessSnapshot.java
+++ b/app/src/main/java/org/apache/fineract/data/models/loan/CreditWorthinessSnapshot.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.loan;
+package org.apache.fineract.data.models.loan;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/org/apache/fineract/data/models/loan/LoanAccount.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/LoanAccount.java b/app/src/main/java/org/apache/fineract/data/models/loan/LoanAccount.java
similarity index 98%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/loan/LoanAccount.java
rename to app/src/main/java/org/apache/fineract/data/models/loan/LoanAccount.java
index 2404fba..8385109 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/LoanAccount.java
+++ b/app/src/main/java/org/apache/fineract/data/models/loan/LoanAccount.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.loan;
+package org.apache.fineract.data.models.loan;
 
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;

app/src/main/java/org/apache/fineract/data/models/loan/LoanAccountPage.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/LoanAccountPage.java b/app/src/main/java/org/apache/fineract/data/models/loan/LoanAccountPage.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/loan/LoanAccountPage.java
rename to app/src/main/java/org/apache/fineract/data/models/loan/LoanAccountPage.java
index 6cca0c9..df00674 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/LoanAccountPage.java
+++ b/app/src/main/java/org/apache/fineract/data/models/loan/LoanAccountPage.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.loan;
+package org.apache.fineract.data.models.loan;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/org/apache/fineract/data/models/loan/LoanParameters.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/LoanParameters.java b/app/src/main/java/org/apache/fineract/data/models/loan/LoanParameters.java
similarity index 96%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/loan/LoanParameters.java
rename to app/src/main/java/org/apache/fineract/data/models/loan/LoanParameters.java
index 62a8ebe..3769478 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/LoanParameters.java
+++ b/app/src/main/java/org/apache/fineract/data/models/loan/LoanParameters.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.loan;
+package org.apache.fineract.data.models.loan;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/data/models/loan/PaymentCycle.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/PaymentCycle.java b/app/src/main/java/org/apache/fineract/data/models/loan/PaymentCycle.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/loan/PaymentCycle.java
rename to app/src/main/java/org/apache/fineract/data/models/loan/PaymentCycle.java
index 0a5d105..1e01bc4 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/PaymentCycle.java
+++ b/app/src/main/java/org/apache/fineract/data/models/loan/PaymentCycle.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.loan;
+package org.apache.fineract.data.models.loan;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/data/models/loan/TermRange.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/TermRange.java b/app/src/main/java/org/apache/fineract/data/models/loan/TermRange.java
similarity index 91%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/loan/TermRange.java
rename to app/src/main/java/org/apache/fineract/data/models/loan/TermRange.java
index 3e49735..6dda437 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/loan/TermRange.java
+++ b/app/src/main/java/org/apache/fineract/data/models/loan/TermRange.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.loan;
+package org.apache.fineract.data.models.loan;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/data/models/payment/ChargeName.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/payment/ChargeName.java b/app/src/main/java/org/apache/fineract/data/models/payment/ChargeName.java
similarity index 88%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/payment/ChargeName.java
rename to app/src/main/java/org/apache/fineract/data/models/payment/ChargeName.java
index 55c130a..c18fc75 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/payment/ChargeName.java
+++ b/app/src/main/java/org/apache/fineract/data/models/payment/ChargeName.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.payment;
+package org.apache.fineract.data.models.payment;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/data/models/payment/CostComponent.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/payment/CostComponent.java b/app/src/main/java/org/apache/fineract/data/models/payment/CostComponent.java
similarity index 89%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/payment/CostComponent.java
rename to app/src/main/java/org/apache/fineract/data/models/payment/CostComponent.java
index 183a686..5179ea9 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/payment/CostComponent.java
+++ b/app/src/main/java/org/apache/fineract/data/models/payment/CostComponent.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.payment;
+package org.apache.fineract.data.models.payment;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/data/models/payment/PlannedPayment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/payment/PlannedPayment.java b/app/src/main/java/org/apache/fineract/data/models/payment/PlannedPayment.java
similarity index 94%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/payment/PlannedPayment.java
rename to app/src/main/java/org/apache/fineract/data/models/payment/PlannedPayment.java
index 2d413c0..a657a56 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/payment/PlannedPayment.java
+++ b/app/src/main/java/org/apache/fineract/data/models/payment/PlannedPayment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.payment;
+package org.apache.fineract.data.models.payment;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/data/models/payment/PlannedPaymentPage.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/payment/PlannedPaymentPage.java b/app/src/main/java/org/apache/fineract/data/models/payment/PlannedPaymentPage.java
similarity index 94%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/payment/PlannedPaymentPage.java
rename to app/src/main/java/org/apache/fineract/data/models/payment/PlannedPaymentPage.java
index 6a4dbb8..3cd4a76 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/payment/PlannedPaymentPage.java
+++ b/app/src/main/java/org/apache/fineract/data/models/payment/PlannedPaymentPage.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.payment;
+package org.apache.fineract.data.models.payment;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/data/models/product/BalanceRange.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/product/BalanceRange.java b/app/src/main/java/org/apache/fineract/data/models/product/BalanceRange.java
similarity index 88%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/product/BalanceRange.java
rename to app/src/main/java/org/apache/fineract/data/models/product/BalanceRange.java
index 7dea458..40be313 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/product/BalanceRange.java
+++ b/app/src/main/java/org/apache/fineract/data/models/product/BalanceRange.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.product;
+package org.apache.fineract.data.models.product;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/data/models/product/InterestBasis.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/product/InterestBasis.java b/app/src/main/java/org/apache/fineract/data/models/product/InterestBasis.java
similarity index 70%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/product/InterestBasis.java
rename to app/src/main/java/org/apache/fineract/data/models/product/InterestBasis.java
index 400d990..1a3e61c 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/product/InterestBasis.java
+++ b/app/src/main/java/org/apache/fineract/data/models/product/InterestBasis.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.product;
+package org.apache.fineract.data.models.product;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/data/models/product/InterestRange.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/product/InterestRange.java b/app/src/main/java/org/apache/fineract/data/models/product/InterestRange.java
similarity index 88%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/product/InterestRange.java
rename to app/src/main/java/org/apache/fineract/data/models/product/InterestRange.java
index 6946636..e6cf1f4 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/product/InterestRange.java
+++ b/app/src/main/java/org/apache/fineract/data/models/product/InterestRange.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.product;
+package org.apache.fineract.data.models.product;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/data/models/product/Product.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/product/Product.java b/app/src/main/java/org/apache/fineract/data/models/product/Product.java
similarity index 94%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/product/Product.java
rename to app/src/main/java/org/apache/fineract/data/models/product/Product.java
index d2d8d23..c29f428 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/product/Product.java
+++ b/app/src/main/java/org/apache/fineract/data/models/product/Product.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.data.models.product;
+package org.apache.fineract.data.models.product;
 
-import com.mifos.apache.fineract.data.models.loan.AccountAssignment;
-import com.mifos.apache.fineract.data.models.loan.TermRange;
+import org.apache.fineract.data.models.loan.AccountAssignment;
+import org.apache.fineract.data.models.loan.TermRange;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/data/models/product/ProductPage.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/product/ProductPage.java b/app/src/main/java/org/apache/fineract/data/models/product/ProductPage.java
similarity index 92%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/product/ProductPage.java
rename to app/src/main/java/org/apache/fineract/data/models/product/ProductPage.java
index 7e52cd3..1dc5c21 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/product/ProductPage.java
+++ b/app/src/main/java/org/apache/fineract/data/models/product/ProductPage.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.product;
+package org.apache.fineract.data.models.product;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/data/models/rolesandpermission/AllowedOperation.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/rolesandpermission/AllowedOperation.java b/app/src/main/java/org/apache/fineract/data/models/rolesandpermission/AllowedOperation.java
similarity index 81%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/rolesandpermission/AllowedOperation.java
rename to app/src/main/java/org/apache/fineract/data/models/rolesandpermission/AllowedOperation.java
index e1d36cc..37d91c5 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/rolesandpermission/AllowedOperation.java
+++ b/app/src/main/java/org/apache/fineract/data/models/rolesandpermission/AllowedOperation.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.rolesandpermission;
+package org.apache.fineract.data.models.rolesandpermission;
 
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/org/apache/fineract/data/models/rolesandpermission/Permission.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/rolesandpermission/Permission.java b/app/src/main/java/org/apache/fineract/data/models/rolesandpermission/Permission.java
similarity index 96%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/rolesandpermission/Permission.java
rename to app/src/main/java/org/apache/fineract/data/models/rolesandpermission/Permission.java
index fbf4c20..2c8b5c6 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/rolesandpermission/Permission.java
+++ b/app/src/main/java/org/apache/fineract/data/models/rolesandpermission/Permission.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.rolesandpermission;
+package org.apache.fineract.data.models.rolesandpermission;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/org/apache/fineract/data/models/rolesandpermission/Role.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/models/rolesandpermission/Role.java b/app/src/main/java/org/apache/fineract/data/models/rolesandpermission/Role.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/data/models/rolesandpermission/Role.java
rename to app/src/main/java/org/apache/fineract/data/models/rolesandpermission/Role.java
index acfedaf..4229fc1 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/models/rolesandpermission/Role.java
+++ b/app/src/main/java/org/apache/fineract/data/models/rolesandpermission/Role.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.models.rolesandpermission;
+package org.apache.fineract.data.models.rolesandpermission;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/org/apache/fineract/data/remote/BaseApiManager.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/remote/BaseApiManager.java b/app/src/main/java/org/apache/fineract/data/remote/BaseApiManager.java
similarity index 87%
rename from app/src/main/java/com/mifos/apache/fineract/data/remote/BaseApiManager.java
rename to app/src/main/java/org/apache/fineract/data/remote/BaseApiManager.java
index e4c3bcc..c3757c1 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/remote/BaseApiManager.java
+++ b/app/src/main/java/org/apache/fineract/data/remote/BaseApiManager.java
@@ -1,14 +1,14 @@
-package com.mifos.apache.fineract.data.remote;
+package org.apache.fineract.data.remote;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.data.services.AnonymousService;
-import com.mifos.apache.fineract.data.services.AuthService;
-import com.mifos.apache.fineract.data.services.CustomerService;
-import com.mifos.apache.fineract.data.services.DepositService;
-import com.mifos.apache.fineract.data.services.IndividualLendingService;
-import com.mifos.apache.fineract.data.services.LoanService;
-import com.mifos.apache.fineract.data.services.RolesService;
+import org.apache.fineract.data.services.AnonymousService;
+import org.apache.fineract.data.services.AuthService;
+import org.apache.fineract.data.services.CustomerService;
+import org.apache.fineract.data.services.DepositService;
+import org.apache.fineract.data.services.IndividualLendingService;
+import org.apache.fineract.data.services.LoanService;
+import org.apache.fineract.data.services.RolesService;
 
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;

app/src/main/java/org/apache/fineract/data/remote/BaseUrl.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/remote/BaseUrl.java b/app/src/main/java/org/apache/fineract/data/remote/BaseUrl.java
similarity index 92%
rename from app/src/main/java/com/mifos/apache/fineract/data/remote/BaseUrl.java
rename to app/src/main/java/org/apache/fineract/data/remote/BaseUrl.java
index 2268b20..a825284 100755
--- a/app/src/main/java/com/mifos/apache/fineract/data/remote/BaseUrl.java
+++ b/app/src/main/java/org/apache/fineract/data/remote/BaseUrl.java
@@ -3,7 +3,7 @@
  * See https://github.com/openMF/android-client/blob/master/LICENSE.md
  */
 
-package com.mifos.apache.fineract.data.remote;
+package org.apache.fineract.data.remote;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/data/remote/EndPoints.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/remote/EndPoints.java b/app/src/main/java/org/apache/fineract/data/remote/EndPoints.java
similarity index 90%
rename from app/src/main/java/com/mifos/apache/fineract/data/remote/EndPoints.java
rename to app/src/main/java/org/apache/fineract/data/remote/EndPoints.java
index cbbd7db..8172ea0 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/remote/EndPoints.java
+++ b/app/src/main/java/org/apache/fineract/data/remote/EndPoints.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.remote;
+package org.apache.fineract.data.remote;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/data/remote/MifosInterceptor.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/remote/MifosInterceptor.java b/app/src/main/java/org/apache/fineract/data/remote/MifosInterceptor.java
similarity index 92%
rename from app/src/main/java/com/mifos/apache/fineract/data/remote/MifosInterceptor.java
rename to app/src/main/java/org/apache/fineract/data/remote/MifosInterceptor.java
index d6f2f8c..4f5f176 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/remote/MifosInterceptor.java
+++ b/app/src/main/java/org/apache/fineract/data/remote/MifosInterceptor.java
@@ -3,15 +3,15 @@
  * See https://github.com/openMF/android-client/blob/master/LICENSE.md
  */
 
-package com.mifos.apache.fineract.data.remote;
+package org.apache.fineract.data.remote;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
-import com.mifos.apache.fineract.MifosApplication;
-import com.mifos.apache.fineract.data.local.PreferenceKey;
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.MifosApplication;
+import org.apache.fineract.data.local.PreferenceKey;
+import org.apache.fineract.data.local.PreferencesHelper;
 
 import java.io.IOException;
 import java.util.HashSet;

app/src/main/java/org/apache/fineract/data/remote/MifosOkHttpClient.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/remote/MifosOkHttpClient.java b/app/src/main/java/org/apache/fineract/data/remote/MifosOkHttpClient.java
similarity index 98%
rename from app/src/main/java/com/mifos/apache/fineract/data/remote/MifosOkHttpClient.java
rename to app/src/main/java/org/apache/fineract/data/remote/MifosOkHttpClient.java
index b985746..3bbe55b 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/remote/MifosOkHttpClient.java
+++ b/app/src/main/java/org/apache/fineract/data/remote/MifosOkHttpClient.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.remote;
+package org.apache.fineract.data.remote;
 
 import android.content.Context;
 

app/src/main/java/org/apache/fineract/data/remote/NullOnEmptyConverterFactory.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/remote/NullOnEmptyConverterFactory.java b/app/src/main/java/org/apache/fineract/data/remote/NullOnEmptyConverterFactory.java
similarity index 94%
rename from app/src/main/java/com/mifos/apache/fineract/data/remote/NullOnEmptyConverterFactory.java
rename to app/src/main/java/org/apache/fineract/data/remote/NullOnEmptyConverterFactory.java
index ddf6d90..58e3af7 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/remote/NullOnEmptyConverterFactory.java
+++ b/app/src/main/java/org/apache/fineract/data/remote/NullOnEmptyConverterFactory.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.data.remote;
+package org.apache.fineract.data.remote;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;

app/src/main/java/org/apache/fineract/data/remote/ReceivedCookiesInterceptor.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/remote/ReceivedCookiesInterceptor.java b/app/src/main/java/org/apache/fineract/data/remote/ReceivedCookiesInterceptor.java
similarity index 81%
rename from app/src/main/java/com/mifos/apache/fineract/data/remote/ReceivedCookiesInterceptor.java
rename to app/src/main/java/org/apache/fineract/data/remote/ReceivedCookiesInterceptor.java
index caaa325..218615f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/remote/ReceivedCookiesInterceptor.java
+++ b/app/src/main/java/org/apache/fineract/data/remote/ReceivedCookiesInterceptor.java
@@ -1,10 +1,10 @@
-package com.mifos.apache.fineract.data.remote;
+package org.apache.fineract.data.remote;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.MifosApplication;
-import com.mifos.apache.fineract.data.local.PreferenceKey;
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.MifosApplication;
+import org.apache.fineract.data.local.PreferenceKey;
+import org.apache.fineract.data.local.PreferencesHelper;
 
 import java.io.IOException;
 import java.util.HashSet;

app/src/main/java/org/apache/fineract/data/services/AnonymousService.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/services/AnonymousService.java b/app/src/main/java/org/apache/fineract/data/services/AnonymousService.java
similarity index 73%
rename from app/src/main/java/com/mifos/apache/fineract/data/services/AnonymousService.java
rename to app/src/main/java/org/apache/fineract/data/services/AnonymousService.java
index 5be7420..dfd7782 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/services/AnonymousService.java
+++ b/app/src/main/java/org/apache/fineract/data/services/AnonymousService.java
@@ -1,6 +1,6 @@
-package com.mifos.apache.fineract.data.services;
+package org.apache.fineract.data.services;
 
-import com.mifos.apache.fineract.data.models.customer.Country;
+import org.apache.fineract.data.models.customer.Country;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/data/services/AuthService.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/services/AuthService.java b/app/src/main/java/org/apache/fineract/data/services/AuthService.java
similarity index 75%
rename from app/src/main/java/com/mifos/apache/fineract/data/services/AuthService.java
rename to app/src/main/java/org/apache/fineract/data/services/AuthService.java
index 6e98c67..46a9498 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/services/AuthService.java
+++ b/app/src/main/java/org/apache/fineract/data/services/AuthService.java
@@ -1,8 +1,8 @@
-package com.mifos.apache.fineract.data.services;
+package org.apache.fineract.data.services;
 
 
-import com.mifos.apache.fineract.data.models.Authentication;
-import com.mifos.apache.fineract.data.remote.EndPoints;
+import org.apache.fineract.data.models.Authentication;
+import org.apache.fineract.data.remote.EndPoints;
 
 import io.reactivex.Observable;
 import retrofit2.http.POST;

app/src/main/java/org/apache/fineract/data/services/CustomerService.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/services/CustomerService.java b/app/src/main/java/org/apache/fineract/data/services/CustomerService.java
similarity index 90%
rename from app/src/main/java/com/mifos/apache/fineract/data/services/CustomerService.java
rename to app/src/main/java/org/apache/fineract/data/services/CustomerService.java
index abf7948..c548f62 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/services/CustomerService.java
+++ b/app/src/main/java/org/apache/fineract/data/services/CustomerService.java
@@ -1,11 +1,11 @@
-package com.mifos.apache.fineract.data.services;
+package org.apache.fineract.data.services;
 
-import com.mifos.apache.fineract.data.models.customer.Command;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.data.models.customer.CustomerPage;
-import com.mifos.apache.fineract.data.models.customer.identification.Identification;
-import com.mifos.apache.fineract.data.models.customer.identification.ScanCard;
-import com.mifos.apache.fineract.data.remote.EndPoints;
+import org.apache.fineract.data.models.customer.Command;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.data.models.customer.CustomerPage;
+import org.apache.fineract.data.models.customer.identification.Identification;
+import org.apache.fineract.data.models.customer.identification.ScanCard;
+import org.apache.fineract.data.remote.EndPoints;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/data/services/DepositService.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/services/DepositService.java b/app/src/main/java/org/apache/fineract/data/services/DepositService.java
similarity index 82%
rename from app/src/main/java/com/mifos/apache/fineract/data/services/DepositService.java
rename to app/src/main/java/org/apache/fineract/data/services/DepositService.java
index d6000eb..508a055 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/services/DepositService.java
+++ b/app/src/main/java/org/apache/fineract/data/services/DepositService.java
@@ -1,8 +1,8 @@
-package com.mifos.apache.fineract.data.services;
+package org.apache.fineract.data.services;
 
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.data.models.deposit.ProductDefinition;
-import com.mifos.apache.fineract.data.remote.EndPoints;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.data.models.deposit.ProductDefinition;
+import org.apache.fineract.data.remote.EndPoints;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/data/services/IndividualLendingService.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/services/IndividualLendingService.java b/app/src/main/java/org/apache/fineract/data/services/IndividualLendingService.java
similarity index 80%
rename from app/src/main/java/com/mifos/apache/fineract/data/services/IndividualLendingService.java
rename to app/src/main/java/org/apache/fineract/data/services/IndividualLendingService.java
index 2ecf2cc..77b1e63 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/services/IndividualLendingService.java
+++ b/app/src/main/java/org/apache/fineract/data/services/IndividualLendingService.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.data.services;
+package org.apache.fineract.data.services;
 
-import com.mifos.apache.fineract.data.models.payment.PlannedPaymentPage;
-import com.mifos.apache.fineract.data.remote.EndPoints;
+import org.apache.fineract.data.models.payment.PlannedPaymentPage;
+import org.apache.fineract.data.remote.EndPoints;
 
 import io.reactivex.Observable;
 import retrofit2.http.GET;

app/src/main/java/org/apache/fineract/data/services/LoanService.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/services/LoanService.java b/app/src/main/java/org/apache/fineract/data/services/LoanService.java
similarity index 81%
rename from app/src/main/java/com/mifos/apache/fineract/data/services/LoanService.java
rename to app/src/main/java/org/apache/fineract/data/services/LoanService.java
index 29ab250..f547c9f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/services/LoanService.java
+++ b/app/src/main/java/org/apache/fineract/data/services/LoanService.java
@@ -1,9 +1,9 @@
-package com.mifos.apache.fineract.data.services;
+package org.apache.fineract.data.services;
 
-import com.mifos.apache.fineract.data.models.loan.LoanAccount;
-import com.mifos.apache.fineract.data.models.loan.LoanAccountPage;
-import com.mifos.apache.fineract.data.models.product.ProductPage;
-import com.mifos.apache.fineract.data.remote.EndPoints;
+import org.apache.fineract.data.models.loan.LoanAccount;
+import org.apache.fineract.data.models.loan.LoanAccountPage;
+import org.apache.fineract.data.models.product.ProductPage;
+import org.apache.fineract.data.remote.EndPoints;
 
 import io.reactivex.Completable;
 import io.reactivex.Observable;

app/src/main/java/org/apache/fineract/data/services/RolesService.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/data/services/RolesService.java b/app/src/main/java/org/apache/fineract/data/services/RolesService.java
similarity index 60%
rename from app/src/main/java/com/mifos/apache/fineract/data/services/RolesService.java
rename to app/src/main/java/org/apache/fineract/data/services/RolesService.java
index 377c8e9..138efc6 100644
--- a/app/src/main/java/com/mifos/apache/fineract/data/services/RolesService.java
+++ b/app/src/main/java/org/apache/fineract/data/services/RolesService.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.data.services;
+package org.apache.fineract.data.services;
 
-import com.mifos.apache.fineract.data.models.rolesandpermission.Role;
-import com.mifos.apache.fineract.data.remote.EndPoints;
+import org.apache.fineract.data.models.rolesandpermission.Role;
+import org.apache.fineract.data.remote.EndPoints;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/exceptions/ExceptionStatusCode.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/exceptions/ExceptionStatusCode.java b/app/src/main/java/org/apache/fineract/exceptions/ExceptionStatusCode.java
similarity index 84%
rename from app/src/main/java/com/mifos/apache/fineract/exceptions/ExceptionStatusCode.java
rename to app/src/main/java/org/apache/fineract/exceptions/ExceptionStatusCode.java
index 231d520..6ea0e25 100644
--- a/app/src/main/java/com/mifos/apache/fineract/exceptions/ExceptionStatusCode.java
+++ b/app/src/main/java/org/apache/fineract/exceptions/ExceptionStatusCode.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.exceptions;
+package org.apache.fineract.exceptions;
 
 import retrofit2.HttpException;
 

app/src/main/java/org/apache/fineract/exceptions/InvalidTextInputException.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/exceptions/InvalidTextInputException.java b/app/src/main/java/org/apache/fineract/exceptions/InvalidTextInputException.java
similarity index 90%
rename from app/src/main/java/com/mifos/apache/fineract/exceptions/InvalidTextInputException.java
rename to app/src/main/java/org/apache/fineract/exceptions/InvalidTextInputException.java
index 0d2f746..35c5e1f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/exceptions/InvalidTextInputException.java
+++ b/app/src/main/java/org/apache/fineract/exceptions/InvalidTextInputException.java
@@ -1,10 +1,10 @@
-package com.mifos.apache.fineract.exceptions;
+package org.apache.fineract.exceptions;
 
 import android.content.Context;
 import android.view.View;
 import android.widget.Toast;
 
-import com.mifos.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.base.Toaster;
 
 public class InvalidTextInputException extends Exception {
     public static final String TYPE_ALPHABETS = "Alphabets";

app/src/main/java/org/apache/fineract/exceptions/RequiredFieldException.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/exceptions/RequiredFieldException.java b/app/src/main/java/org/apache/fineract/exceptions/RequiredFieldException.java
similarity index 92%
rename from app/src/main/java/com/mifos/apache/fineract/exceptions/RequiredFieldException.java
rename to app/src/main/java/org/apache/fineract/exceptions/RequiredFieldException.java
index decd672..81edc21 100644
--- a/app/src/main/java/com/mifos/apache/fineract/exceptions/RequiredFieldException.java
+++ b/app/src/main/java/org/apache/fineract/exceptions/RequiredFieldException.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.exceptions;
+package org.apache.fineract.exceptions;
 
 import android.content.Context;
 import android.widget.Toast;

app/src/main/java/org/apache/fineract/exceptions/ShortOfLengthException.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/exceptions/ShortOfLengthException.java b/app/src/main/java/org/apache/fineract/exceptions/ShortOfLengthException.java
similarity index 93%
rename from app/src/main/java/com/mifos/apache/fineract/exceptions/ShortOfLengthException.java
rename to app/src/main/java/org/apache/fineract/exceptions/ShortOfLengthException.java
index 7a74528..a20fb4f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/exceptions/ShortOfLengthException.java
+++ b/app/src/main/java/org/apache/fineract/exceptions/ShortOfLengthException.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.exceptions;
+package org.apache.fineract.exceptions;
 
 import android.content.Context;
 import android.widget.Toast;

app/src/main/java/org/apache/fineract/injection/ActivityContext.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/injection/ActivityContext.java b/app/src/main/java/org/apache/fineract/injection/ActivityContext.java
similarity index 81%
rename from app/src/main/java/com/mifos/apache/fineract/injection/ActivityContext.java
rename to app/src/main/java/org/apache/fineract/injection/ActivityContext.java
index b96e747..d36dbc7 100644
--- a/app/src/main/java/com/mifos/apache/fineract/injection/ActivityContext.java
+++ b/app/src/main/java/org/apache/fineract/injection/ActivityContext.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.injection;
+package org.apache.fineract.injection;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

app/src/main/java/org/apache/fineract/injection/ApplicationContext.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/injection/ApplicationContext.java b/app/src/main/java/org/apache/fineract/injection/ApplicationContext.java
similarity index 81%
rename from app/src/main/java/com/mifos/apache/fineract/injection/ApplicationContext.java
rename to app/src/main/java/org/apache/fineract/injection/ApplicationContext.java
index 2f05e00..2463272 100644
--- a/app/src/main/java/com/mifos/apache/fineract/injection/ApplicationContext.java
+++ b/app/src/main/java/org/apache/fineract/injection/ApplicationContext.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.injection;
+package org.apache.fineract.injection;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

app/src/main/java/org/apache/fineract/injection/ConfigPersistent.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/injection/ConfigPersistent.java b/app/src/main/java/org/apache/fineract/injection/ConfigPersistent.java
similarity index 86%
rename from app/src/main/java/com/mifos/apache/fineract/injection/ConfigPersistent.java
rename to app/src/main/java/org/apache/fineract/injection/ConfigPersistent.java
index 4f8cf01..9d9481e 100644
--- a/app/src/main/java/com/mifos/apache/fineract/injection/ConfigPersistent.java
+++ b/app/src/main/java/org/apache/fineract/injection/ConfigPersistent.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.injection;
+package org.apache.fineract.injection;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

app/src/main/java/org/apache/fineract/injection/PerActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/injection/PerActivity.java b/app/src/main/java/org/apache/fineract/injection/PerActivity.java
similarity index 88%
rename from app/src/main/java/com/mifos/apache/fineract/injection/PerActivity.java
rename to app/src/main/java/org/apache/fineract/injection/PerActivity.java
index bcf72ec..ee0de8a 100755
--- a/app/src/main/java/com/mifos/apache/fineract/injection/PerActivity.java
+++ b/app/src/main/java/org/apache/fineract/injection/PerActivity.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.injection;
+package org.apache.fineract.injection;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

app/src/main/java/org/apache/fineract/injection/component/ActivityComponent.java

diff --git a/app/src/main/java/org/apache/fineract/injection/component/ActivityComponent.java b/app/src/main/java/org/apache/fineract/injection/component/ActivityComponent.java
new file mode 100644
index 0000000..b906e9b
--- /dev/null
+++ b/app/src/main/java/org/apache/fineract/injection/component/ActivityComponent.java
@@ -0,0 +1,100 @@
+package org.apache.fineract.injection.component;
+
+import org.apache.fineract.injection.PerActivity;
+import org.apache.fineract.injection.module.ActivityModule;
+import org.apache.fineract.ui.online.DashboardActivity;
+import org.apache.fineract.ui.online.customers.createcustomer.customeractivity.CreateCustomerActivity;
+import org.apache.fineract.ui.online.customers.createcustomer.formcustomeraddress.FormCustomerAddressFragment;
+
+import org.apache.fineract.ui.online.customers.customeractivities.CustomerActivitiesFragment;
+import org.apache.fineract.ui.online.customers.customerlist.CustomersFragment;
+import org.apache.fineract.ui.online.customers.customerprofile.editcustomerprofilebottomsheet.EditCustomerProfileBottomSheet;
+import org.apache.fineract.ui.online.customers.customertasks.CustomerTasksBottomSheetFragment;
+import org.apache.fineract.ui.online.depositaccounts.createdepositaccount.FormDepositOverviewFragment;
+
+import org.apache.fineract.ui.online.depositaccounts.createdepositaccount.createdepositactivity.CreateDepositActivity;
+import org.apache.fineract.ui.online.depositaccounts.createdepositaccount.formdepositassignproduct.FormDepositAssignProductFragment;
+import org.apache.fineract.ui.online.depositaccounts.depositaccountslist.DepositAccountsFragment;
+import org.apache.fineract.ui.online.customers.customerdetails.CustomerDetailsFragment;
+import org.apache.fineract.ui.online.loanaccounts.loanaccountlist.LoanAccountsFragment;
+import org.apache.fineract.ui.online.loanaccounts.debtincomereport.DebtIncomeReportFragment;
+import org.apache.fineract.ui.online.depositaccounts.depositaccountdetails.DepositAccountDetailsFragment;
+import org.apache.fineract.ui.online.identification.createidentification.identificationactivity.CreateIdentificationActivity;
+import org.apache.fineract.ui.online.identification.identificationdetails.IdentificationDetailsFragment;
+import org.apache.fineract.ui.online.identification.identificationlist.IdentificationsFragment;
+import org.apache.fineract.ui.online.identification.uploadidentificationscan.UploadIdentificationCardBottomSheet;
+import org.apache.fineract.ui.online.launcher.LauncherActivity;
+import org.apache.fineract.ui.online.loanaccounts.loanapplication.BaseFragmentDebtIncome;
+import org.apache.fineract.ui.online.loanaccounts.loanapplication.loanactivity.LoanApplicationActivity;
+import org.apache.fineract.ui.online.loanaccounts.loanapplication.loancosigner.LoanCoSignerFragment;
+import org.apache.fineract.ui.online.loanaccounts.loanapplication.loandetails.LoanDetailsFragment;
+import org.apache.fineract.ui.online.loanaccounts.loandetails.CustomerLoanDetailsFragment;
+import org.apache.fineract.ui.online.login.LoginActivity;
+import org.apache.fineract.ui.online.loanaccounts.plannedpayment.PlannedPaymentFragment;
+import org.apache.fineract.ui.online.roles.roleslist.RolesFragment;
+
+import dagger.Subcomponent;
+
+/**
+ * This component inject dependencies to all Activities across the application
+ */
+@PerActivity
+@Subcomponent(modules = ActivityModule.class)
+public interface ActivityComponent {
+
+    void inject(LoginActivity loginActivity);
+
+    void inject(LauncherActivity launcherActivity);
+
+    void inject(CustomersFragment customersFragment);
+
+    void inject(CustomerDetailsFragment customerDetailsFragment);
+
+    void inject(DepositAccountsFragment customerDepositFragment);
+
+    void inject(LoanAccountsFragment customerLoansFragment);
+
+    void inject(CustomerLoanDetailsFragment customerLoanDetailsFragment);
+
+    void inject(DepositAccountDetailsFragment customerDepositDetailsFragment);
+
+    void inject(PlannedPaymentFragment plannedPaymentFragment);
+
+    void inject(LoanApplicationActivity loanApplicationActivity);
+
+    void inject(LoanDetailsFragment loanDetailsFragment);
+
+    void inject(BaseFragmentDebtIncome loanDebtIncomeFragment);
+
+    void inject(LoanCoSignerFragment loanCoSignerFragment);
+
+    void inject(CreateCustomerActivity createCustomerActivity);
+
+    void inject(FormCustomerAddressFragment formCustomerAddressFragment);
+
+    void inject(CustomerTasksBottomSheetFragment tasksBottomSheetFragment);
+
+    void inject(DebtIncomeReportFragment debtIncomeReportFragment);
+
+    void inject(IdentificationsFragment identificationsFragment);
+
+    void inject(CreateIdentificationActivity createIdentificationActivity);
+
+    void inject(IdentificationDetailsFragment identificationDetailsFragment);
+
+    void inject(UploadIdentificationCardBottomSheet uploadIdentificationCardBottomSheet);
+
+    void inject(EditCustomerProfileBottomSheet editCustomerProfileBottomSheet);
+
+    void inject(FormDepositAssignProductFragment formDepositAssignProductFragment);
+
+    void inject(FormDepositOverviewFragment formDepositOverviewFragment);
+
+    void inject(CreateDepositActivity createDepositActivity);
+
+    void inject(CustomerActivitiesFragment customerActivitiesFragment);
+
+    void inject(DashboardActivity dashboardActivity);
+
+    void inject(RolesFragment rolesFragment);
+}

app/src/main/java/org/apache/fineract/injection/component/ApplicationComponent.java

diff --git a/app/src/main/java/org/apache/fineract/injection/component/ApplicationComponent.java b/app/src/main/java/org/apache/fineract/injection/component/ApplicationComponent.java
new file mode 100644
index 0000000..f1a8633
--- /dev/null
+++ b/app/src/main/java/org/apache/fineract/injection/component/ApplicationComponent.java
@@ -0,0 +1,47 @@
+package org.apache.fineract.injection.component;
+
+import android.app.Application;
+import android.content.Context;
+
+import org.apache.fineract.MifosApplication;
+import org.apache.fineract.data.datamanager.DataManagerAnonymous;
+import org.apache.fineract.data.datamanager.DataManagerAuth;
+import org.apache.fineract.data.datamanager.DataManagerCustomer;
+import org.apache.fineract.data.datamanager.DataManagerDeposit;
+import org.apache.fineract.data.datamanager.DataManagerIndividualLending;
+import org.apache.fineract.data.datamanager.DataManagerLoans;
+import org.apache.fineract.data.datamanager.DataManagerRoles;
+import org.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.data.remote.BaseApiManager;
+import org.apache.fineract.data.remote.MifosInterceptor;
+import org.apache.fineract.data.remote.ReceivedCookiesInterceptor;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.module.ApplicationModule;
+
+import javax.inject.Singleton;
+
+import dagger.Component;
+
+@Singleton
+@Component(modules = ApplicationModule.class)
+public interface ApplicationComponent {
+
+    @ApplicationContext
+    Context context();
+    Application application();
+    DataManagerAuth dataManager();
+    DataManagerCustomer dataManagerCustomer();
+    DataManagerDeposit dataManagerDeposit();
+    DataManagerLoans dataManagerLoans();
+    DataManagerIndividualLending dataManagerIndividualLending();
+    DataManagerAnonymous dataManagerAnonymous();
+    DataManagerRoles dataManagerRolesAndPermissions();
+    BaseApiManager baseApiManager();
+    PreferencesHelper preferencesHelper();
+
+    void inject(MifosInterceptor mifosInterceptor);
+    void inject(MifosApplication mifosApplication);
+
+    void inject(ReceivedCookiesInterceptor receivedCookiesInterceptor);
+
+}

app/src/main/java/org/apache/fineract/injection/component/ConfigPersistentComponent.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/injection/component/ConfigPersistentComponent.java b/app/src/main/java/org/apache/fineract/injection/component/ConfigPersistentComponent.java
similarity index 77%
rename from app/src/main/java/com/mifos/apache/fineract/injection/component/ConfigPersistentComponent.java
rename to app/src/main/java/org/apache/fineract/injection/component/ConfigPersistentComponent.java
index a608dea..060276f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/injection/component/ConfigPersistentComponent.java
+++ b/app/src/main/java/org/apache/fineract/injection/component/ConfigPersistentComponent.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.injection.component;
+package org.apache.fineract.injection.component;
 
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.injection.module.ActivityModule;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.injection.module.ActivityModule;
 
 import dagger.Component;
 

app/src/main/java/org/apache/fineract/injection/module/ActivityModule.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/injection/module/ActivityModule.java b/app/src/main/java/org/apache/fineract/injection/module/ActivityModule.java
similarity index 79%
rename from app/src/main/java/com/mifos/apache/fineract/injection/module/ActivityModule.java
rename to app/src/main/java/org/apache/fineract/injection/module/ActivityModule.java
index 208dce4..98e7d34 100644
--- a/app/src/main/java/com/mifos/apache/fineract/injection/module/ActivityModule.java
+++ b/app/src/main/java/org/apache/fineract/injection/module/ActivityModule.java
@@ -1,9 +1,9 @@
-package com.mifos.apache.fineract.injection.module;
+package org.apache.fineract.injection.module;
 
 import android.app.Activity;
 import android.content.Context;
 
-import com.mifos.apache.fineract.injection.ActivityContext;
+import org.apache.fineract.injection.ActivityContext;
 
 import dagger.Module;
 import dagger.Provides;

app/src/main/java/org/apache/fineract/injection/module/ApplicationModule.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/injection/module/ApplicationModule.java b/app/src/main/java/org/apache/fineract/injection/module/ApplicationModule.java
similarity index 80%
rename from app/src/main/java/com/mifos/apache/fineract/injection/module/ApplicationModule.java
rename to app/src/main/java/org/apache/fineract/injection/module/ApplicationModule.java
index da9dd02..bee244f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/injection/module/ApplicationModule.java
+++ b/app/src/main/java/org/apache/fineract/injection/module/ApplicationModule.java
@@ -1,10 +1,10 @@
-package com.mifos.apache.fineract.injection.module;
+package org.apache.fineract.injection.module;
 
 import android.app.Application;
 import android.content.Context;
 
-import com.mifos.apache.fineract.data.remote.BaseApiManager;
-import com.mifos.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.data.remote.BaseApiManager;
+import org.apache.fineract.injection.ApplicationContext;
 
 import javax.inject.Singleton;
 

app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/BeneficiaryAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAdapter.java
similarity index 93%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/BeneficiaryAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAdapter.java
index 979fae8..2b71cb6 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/BeneficiaryAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAdapter.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -8,9 +8,9 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.ui.views.TextDrawable;
+import org.apache.fineract.R;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.ui.views.TextDrawable;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAutoCompleteAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/BeneficiaryAutoCompleteAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAutoCompleteAdapter.java
similarity index 90%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/BeneficiaryAutoCompleteAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAutoCompleteAdapter.java
index c30b4ad..521c917 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/BeneficiaryAutoCompleteAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAutoCompleteAdapter.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
 import android.support.v4.content.ContextCompat;
@@ -10,11 +10,11 @@
 import android.widget.Filterable;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerCustomer;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.data.models.customer.CustomerPage;
-import com.mifos.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerCustomer;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.data.models.customer.CustomerPage;
+import org.apache.fineract.injection.ApplicationContext;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/adapters/CreateCustomerStepAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/CreateCustomerStepAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/CreateCustomerStepAdapter.java
similarity index 76%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/CreateCustomerStepAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/CreateCustomerStepAdapter.java
index 1c9e13d..d20e8e9 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/CreateCustomerStepAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/CreateCustomerStepAdapter.java
@@ -1,20 +1,22 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.support.v4.app.FragmentManager;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.CustomerAction;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.formcustomeraddress.FormCustomerAddressFragment;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.FormCustomerContactFragment;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.FormCustomerDetailsFragment;
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.adapter.AbstractFragmentStepAdapter;
 import com.stepstone.stepper.viewmodel.StepViewModel;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.ui.online.customers.createcustomer.CustomerAction;
+import org.apache.fineract.ui.online.customers.createcustomer.FormCustomerContactFragment;
+import org.apache.fineract.ui.online.customers.createcustomer.FormCustomerDetailsFragment;
+import org.apache.fineract.ui.online.customers.createcustomer.formcustomeraddress
+        .FormCustomerAddressFragment;
+
 /**
  * @author Rajan Maurya
  *         On 25/07/17.

app/src/main/java/org/apache/fineract/ui/adapters/CreateDepositStepAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/CreateDepositStepAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/CreateDepositStepAdapter.java
similarity index 76%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/CreateDepositStepAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/CreateDepositStepAdapter.java
index 5926e02..467edaf 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/CreateDepositStepAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/CreateDepositStepAdapter.java
@@ -1,19 +1,22 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.support.v4.app.FragmentManager;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount.DepositAction;
-import com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount.formdepositassignproduct.FormDepositAssignProductFragment;
-import com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount.FormDepositOverviewFragment;
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.adapter.AbstractFragmentStepAdapter;
 import com.stepstone.stepper.viewmodel.StepViewModel;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.ui.online.depositaccounts.createdepositaccount.DepositAction;
+import org.apache.fineract.ui.online.depositaccounts.createdepositaccount
+        .FormDepositOverviewFragment;
+import org.apache.fineract.ui.online.depositaccounts.createdepositaccount
+        .formdepositassignproduct.FormDepositAssignProductFragment;
+
 /**
  * @author Rajan Maurya
  *         On 13/08/17.

app/src/main/java/org/apache/fineract/ui/adapters/CreateIdentificationStepAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/CreateIdentificationStepAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/CreateIdentificationStepAdapter.java
similarity index 80%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/CreateIdentificationStepAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/CreateIdentificationStepAdapter.java
index 596c99d..776ce02 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/CreateIdentificationStepAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/CreateIdentificationStepAdapter.java
@@ -1,21 +1,22 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.support.v4.app.FragmentManager;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.identification.Identification;
-import com.mifos.apache.fineract.ui.online.identification.createidentification.Action;
-import com.mifos.apache.fineract.ui.online.identification.createidentification
-        .FormIdentificationDetailsFragment;
-import com.mifos.apache.fineract.ui.online.identification.createidentification
-        .FormOverViewIdentificationFragment;
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.adapter.AbstractFragmentStepAdapter;
 import com.stepstone.stepper.viewmodel.StepViewModel;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.identification.Identification;
+import org.apache.fineract.ui.online.identification.createidentification.Action;
+import org.apache.fineract.ui.online.identification.createidentification
+        .FormIdentificationDetailsFragment;
+import org.apache.fineract.ui.online.identification.createidentification
+        .FormOverViewIdentificationFragment;
+
 /**
  * @author Rajan Maurya
  *         On 31/07/17.

app/src/main/java/org/apache/fineract/ui/adapters/CustomerActivitiesAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/CustomerActivitiesAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/CustomerActivitiesAdapter.java
similarity index 88%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/CustomerActivitiesAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/CustomerActivitiesAdapter.java
index de422c4..d871aea 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/CustomerActivitiesAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/CustomerActivitiesAdapter.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -8,11 +8,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.Command;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.utils.DateUtils;
-import com.mifos.apache.fineract.utils.StatusUtils;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.Command;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.utils.DateUtils;
+import org.apache.fineract.utils.StatusUtils;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/adapters/CustomerAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/CustomerAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/CustomerAdapter.java
similarity index 90%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/CustomerAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/CustomerAdapter.java
index 9e33208..a19a275 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/CustomerAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/CustomerAdapter.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
 import android.support.v7.widget.AppCompatImageView;
@@ -9,12 +9,12 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.ui.base.OnItemClickListener;
-import com.mifos.apache.fineract.utils.ImageLoaderUtils;
-import com.mifos.apache.fineract.utils.StatusUtils;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.ui.base.OnItemClickListener;
+import org.apache.fineract.utils.ImageLoaderUtils;
+import org.apache.fineract.utils.StatusUtils;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/adapters/CustomerDepositAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/CustomerDepositAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/CustomerDepositAdapter.java
similarity index 93%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/CustomerDepositAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/CustomerDepositAdapter.java
index 251da6a..95c6a9e 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/CustomerDepositAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/CustomerDepositAdapter.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
 import android.support.v4.content.ContextCompat;
@@ -10,10 +10,10 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.ui.base.OnItemClickListener;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.ui.base.OnItemClickListener;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/adapters/DebtIncomeReportAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/DebtIncomeReportAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/DebtIncomeReportAdapter.java
similarity index 91%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/DebtIncomeReportAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/DebtIncomeReportAdapter.java
index 360fb95..da39cb8 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/DebtIncomeReportAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/DebtIncomeReportAdapter.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -6,8 +6,8 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.loan.CreditWorthinessFactor;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.loan.CreditWorthinessFactor;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/adapters/IdentificationAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/IdentificationAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/IdentificationAdapter.java
similarity index 90%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/IdentificationAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/IdentificationAdapter.java
index 823e02e..6d9a5c9 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/IdentificationAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/IdentificationAdapter.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -8,11 +8,11 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.identification.Identification;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.ui.base.OnItemClickListener;
-import com.mifos.apache.fineract.utils.DateUtils;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.identification.Identification;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.ui.base.OnItemClickListener;
+import org.apache.fineract.utils.DateUtils;
 
 import java.util.ArrayList;
 import java.util.Calendar;

app/src/main/java/org/apache/fineract/ui/adapters/IdentificationScanAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/IdentificationScanAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/IdentificationScanAdapter.java
similarity index 94%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/IdentificationScanAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/IdentificationScanAdapter.java
index a314ca6..19d94f4 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/IdentificationScanAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/IdentificationScanAdapter.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -8,8 +8,8 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.identification.ScanCard;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.identification.ScanCard;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/adapters/LoanAccountListAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/LoanAccountListAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/LoanAccountListAdapter.java
similarity index 90%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/LoanAccountListAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/LoanAccountListAdapter.java
index 6241f7b..06ed84f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/LoanAccountListAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/LoanAccountListAdapter.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
 import android.support.v7.widget.AppCompatImageView;
@@ -9,12 +9,12 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.loan.LoanAccount;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.ui.base.OnItemClickListener;
-import com.mifos.apache.fineract.utils.DateUtils;
-import com.mifos.apache.fineract.utils.StatusUtils;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.loan.LoanAccount;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.ui.base.OnItemClickListener;
+import org.apache.fineract.utils.DateUtils;
+import org.apache.fineract.utils.StatusUtils;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/adapters/LoanApplicationStepAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/LoanApplicationStepAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/LoanApplicationStepAdapter.java
similarity index 78%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/LoanApplicationStepAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/LoanApplicationStepAdapter.java
index 928e648..44f8493 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/LoanApplicationStepAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/LoanApplicationStepAdapter.java
@@ -1,18 +1,19 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.support.v4.app.FragmentManager;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.LoanDebtIncomeFragment;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loancosigner.LoanCoSignerFragment;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loandetails.LoanDetailsFragment;
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.adapter.AbstractFragmentStepAdapter;
 import com.stepstone.stepper.viewmodel.StepViewModel;
 
+import org.apache.fineract.R;
+import org.apache.fineract.ui.online.loanaccounts.loanapplication.LoanDebtIncomeFragment;
+import org.apache.fineract.ui.online.loanaccounts.loanapplication.loancosigner.LoanCoSignerFragment;
+import org.apache.fineract.ui.online.loanaccounts.loanapplication.loandetails.LoanDetailsFragment;
+
 /**
  * @author Rajan Maurya
  *         On 17/07/17.

app/src/main/java/org/apache/fineract/ui/adapters/LoanDebtIncomeAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/LoanDebtIncomeAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/LoanDebtIncomeAdapter.java
similarity index 91%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/LoanDebtIncomeAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/LoanDebtIncomeAdapter.java
index 2503453..65e591f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/LoanDebtIncomeAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/LoanDebtIncomeAdapter.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -6,9 +6,9 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.loan.CreditWorthinessFactor;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.CreditWorthinessSource;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.loan.CreditWorthinessFactor;
+import org.apache.fineract.ui.online.loanaccounts.loanapplication.CreditWorthinessSource;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/adapters/PlannedPaymentAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/PlannedPaymentAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/PlannedPaymentAdapter.java
similarity index 94%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/PlannedPaymentAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/PlannedPaymentAdapter.java
index 62f8490..ac4c045 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/PlannedPaymentAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/PlannedPaymentAdapter.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -10,12 +10,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.payment.CostComponent;
-import com.mifos.apache.fineract.data.models.payment.PlannedPayment;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.utils.DateUtils;
-
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.payment.CostComponent;
+import org.apache.fineract.data.models.payment.PlannedPayment;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.utils.DateUtils;
 import org.zakariya.stickyheaders.SectioningAdapter;
 
 import java.util.ArrayList;

app/src/main/java/org/apache/fineract/ui/adapters/RolesAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/RolesAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/RolesAdapter.java
similarity index 87%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/RolesAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/RolesAdapter.java
index 76a9d92..8006c50 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/RolesAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/RolesAdapter.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -9,12 +9,12 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.rolesandpermission.Role;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.ui.base.OnItemClickListener;
-import com.mifos.apache.fineract.ui.views.TextDrawable;
-import com.mifos.apache.fineract.utils.ColorGenerator;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.rolesandpermission.Role;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.ui.base.OnItemClickListener;
+import org.apache.fineract.ui.views.TextDrawable;
+import org.apache.fineract.utils.ColorGenerator;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/adapters/ViewPagerAdapter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/ViewPagerAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/ViewPagerAdapter.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/ui/adapters/ViewPagerAdapter.java
rename to app/src/main/java/org/apache/fineract/ui/adapters/ViewPagerAdapter.java
index b331047..75d4476 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/adapters/ViewPagerAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/ViewPagerAdapter.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.adapters;
+package org.apache.fineract.ui.adapters;
 
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;

app/src/main/java/org/apache/fineract/ui/base/BaseActivityCallback.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/base/BaseActivityCallback.java b/app/src/main/java/org/apache/fineract/ui/base/BaseActivityCallback.java
similarity index 81%
rename from app/src/main/java/com/mifos/apache/fineract/ui/base/BaseActivityCallback.java
rename to app/src/main/java/org/apache/fineract/ui/base/BaseActivityCallback.java
index d1610e2..4578ef9 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/base/BaseActivityCallback.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/BaseActivityCallback.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.base;
+package org.apache.fineract.ui.base;
 
 public interface BaseActivityCallback {
 

app/src/main/java/org/apache/fineract/ui/base/BasePresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/base/BasePresenter.java b/app/src/main/java/org/apache/fineract/ui/base/BasePresenter.java
similarity index 96%
rename from app/src/main/java/com/mifos/apache/fineract/ui/base/BasePresenter.java
rename to app/src/main/java/org/apache/fineract/ui/base/BasePresenter.java
index 21893a9..1e005c7 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/base/BasePresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/BasePresenter.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.base;
+package org.apache.fineract.ui.base;
 
 import android.content.Context;
 

app/src/main/java/org/apache/fineract/ui/base/EndlessRecyclerViewScrollListener.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/base/EndlessRecyclerViewScrollListener.java b/app/src/main/java/org/apache/fineract/ui/base/EndlessRecyclerViewScrollListener.java
similarity index 98%
rename from app/src/main/java/com/mifos/apache/fineract/ui/base/EndlessRecyclerViewScrollListener.java
rename to app/src/main/java/org/apache/fineract/ui/base/EndlessRecyclerViewScrollListener.java
index 8f686a3..8e89ef8 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/base/EndlessRecyclerViewScrollListener.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/EndlessRecyclerViewScrollListener.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.base;
+package org.apache.fineract.ui.base;
 
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;

app/src/main/java/org/apache/fineract/ui/base/MifosBaseActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/base/MifosBaseActivity.java b/app/src/main/java/org/apache/fineract/ui/base/MifosBaseActivity.java
similarity index 93%
rename from app/src/main/java/com/mifos/apache/fineract/ui/base/MifosBaseActivity.java
rename to app/src/main/java/org/apache/fineract/ui/base/MifosBaseActivity.java
index bf852b1..91e8894 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/base/MifosBaseActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/MifosBaseActivity.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.base;
+package org.apache.fineract.ui.base;
 
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -12,12 +12,12 @@
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
-import com.mifos.apache.fineract.MifosApplication;
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.injection.component.ActivityComponent;
-import com.mifos.apache.fineract.injection.component.ConfigPersistentComponent;
-import com.mifos.apache.fineract.injection.component.DaggerConfigPersistentComponent;
-import com.mifos.apache.fineract.injection.module.ActivityModule;
+import org.apache.fineract.MifosApplication;
+import org.apache.fineract.R;
+import org.apache.fineract.injection.component.ActivityComponent;
+import org.apache.fineract.injection.component.ConfigPersistentComponent;
+import org.apache.fineract.injection.component.DaggerConfigPersistentComponent;
+import org.apache.fineract.injection.module.ActivityModule;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/main/java/org/apache/fineract/ui/base/MifosBaseBottomSheetDialogFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/base/MifosBaseBottomSheetDialogFragment.java b/app/src/main/java/org/apache/fineract/ui/base/MifosBaseBottomSheetDialogFragment.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/ui/base/MifosBaseBottomSheetDialogFragment.java
rename to app/src/main/java/org/apache/fineract/ui/base/MifosBaseBottomSheetDialogFragment.java
index ee34dd9..a8a896b 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/base/MifosBaseBottomSheetDialogFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/MifosBaseBottomSheetDialogFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.base;
+package org.apache.fineract.ui.base;
 
 import android.app.Activity;
 import android.content.Context;
@@ -8,7 +8,7 @@
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
-import com.mifos.apache.fineract.utils.ProgressBarHandler;
+import org.apache.fineract.utils.ProgressBarHandler;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/base/MifosBaseFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/base/MifosBaseFragment.java b/app/src/main/java/org/apache/fineract/ui/base/MifosBaseFragment.java
similarity index 94%
rename from app/src/main/java/com/mifos/apache/fineract/ui/base/MifosBaseFragment.java
rename to app/src/main/java/org/apache/fineract/ui/base/MifosBaseFragment.java
index 08abefd..cf71025 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/base/MifosBaseFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/MifosBaseFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.base;
+package org.apache.fineract.ui.base;
 
 import android.app.Activity;
 import android.content.Context;
@@ -7,7 +7,7 @@
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
-import com.mifos.apache.fineract.utils.ProgressBarHandler;
+import org.apache.fineract.utils.ProgressBarHandler;
 
 public class MifosBaseFragment extends Fragment {
 

app/src/main/java/org/apache/fineract/ui/base/MvpView.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/base/MvpView.java b/app/src/main/java/org/apache/fineract/ui/base/MvpView.java
similarity index 87%
rename from app/src/main/java/com/mifos/apache/fineract/ui/base/MvpView.java
rename to app/src/main/java/org/apache/fineract/ui/base/MvpView.java
index 8c65034..344e11e 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/base/MvpView.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/MvpView.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.base;
+package org.apache.fineract.ui.base;
 
 
 /**

app/src/main/java/org/apache/fineract/ui/base/OnItemClickListener.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/base/OnItemClickListener.java b/app/src/main/java/org/apache/fineract/ui/base/OnItemClickListener.java
similarity index 93%
rename from app/src/main/java/com/mifos/apache/fineract/ui/base/OnItemClickListener.java
rename to app/src/main/java/org/apache/fineract/ui/base/OnItemClickListener.java
index 6b195a1..8a2447b 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/base/OnItemClickListener.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/OnItemClickListener.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.base;
+package org.apache.fineract.ui.base;
 
 import android.view.View;
 

app/src/main/java/org/apache/fineract/ui/base/Presenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/base/Presenter.java b/app/src/main/java/org/apache/fineract/ui/base/Presenter.java
similarity index 86%
rename from app/src/main/java/com/mifos/apache/fineract/ui/base/Presenter.java
rename to app/src/main/java/org/apache/fineract/ui/base/Presenter.java
index 624b11b..9a44a8b 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/base/Presenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/Presenter.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.base;
+package org.apache.fineract.ui.base;
 
 /**
  * Every presenter in the app must either implement this interface or extend BasePresenter

app/src/main/java/org/apache/fineract/ui/base/Toaster.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/base/Toaster.java b/app/src/main/java/org/apache/fineract/ui/base/Toaster.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/ui/base/Toaster.java
rename to app/src/main/java/org/apache/fineract/ui/base/Toaster.java
index bdbd651..142fdf2 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/base/Toaster.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/Toaster.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.base;
+package org.apache.fineract.ui.base;
 
 import android.graphics.Color;
 import android.support.design.widget.Snackbar;
@@ -6,7 +6,7 @@
 import android.view.View;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.MifosApplication;
+import org.apache.fineract.MifosApplication;
 
 public class Toaster {
 

app/src/main/java/org/apache/fineract/ui/online/DashboardActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/DashboardActivity.java b/app/src/main/java/org/apache/fineract/ui/online/DashboardActivity.java
similarity index 89%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/DashboardActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/DashboardActivity.java
index cbc4e28..2a13a0f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/DashboardActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/DashboardActivity.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online;
+package org.apache.fineract.ui.online;
 
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -12,14 +12,14 @@
 import android.view.MenuItem;
 import android.view.View;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.online.customers.customerlist.CustomersFragment;
-import com.mifos.apache.fineract.ui.online.dashboard.DashboardFragment;
-import com.mifos.apache.fineract.ui.online.launcher.LauncherActivity;
-import com.mifos.apache.fineract.ui.online.roles.roleslist.RolesFragment;
-import com.mifos.apache.fineract.utils.MaterialDialog;
+import org.apache.fineract.R;
+import org.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.online.customers.customerlist.CustomersFragment;
+import org.apache.fineract.ui.online.dashboard.DashboardFragment;
+import org.apache.fineract.ui.online.launcher.LauncherActivity;
+import org.apache.fineract.ui.online.roles.roleslist.RolesFragment;
+import org.apache.fineract.utils.MaterialDialog;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/CustomerAction.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/CustomerAction.java b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/CustomerAction.java
similarity index 61%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/CustomerAction.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/CustomerAction.java
index 082a42a..e5aaac7 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/CustomerAction.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/CustomerAction.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.customers.createcustomer;
+package org.apache.fineract.ui.online.customers.createcustomer;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerContactFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/FormCustomerContactFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerContactFragment.java
similarity index 94%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/FormCustomerContactFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerContactFragment.java
index e359233..9ed3ee4 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/FormCustomerContactFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerContactFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.customers.createcustomer;
+package org.apache.fineract.ui.online.customers.createcustomer;
 
 import android.app.Activity;
 import android.content.Context;
@@ -14,14 +14,15 @@
 import android.view.ViewGroup;
 import android.widget.EditText;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.ContactDetail;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.utils.ConstantKeys;
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.VerificationError;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.ContactDetail;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.utils.ConstantKeys;
+
 import java.util.ArrayList;
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerDetailsFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/FormCustomerDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerDetailsFragment.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/FormCustomerDetailsFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerDetailsFragment.java
index 3363e86..5b1ccaf 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/FormCustomerDetailsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerDetailsFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.customers.createcustomer;
+package org.apache.fineract.ui.online.customers.createcustomer;
 
 import android.app.Activity;
 import android.app.DatePickerDialog;
@@ -17,15 +17,16 @@
 import android.widget.DatePicker;
 import android.widget.EditText;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.data.models.customer.DateOfBirth;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.utils.ConstantKeys;
-import com.mifos.apache.fineract.utils.ValidationUtil;
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.VerificationError;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.data.models.customer.DateOfBirth;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.utils.ValidationUtil;
+
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Locale;

app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/OnNavigationBarListener.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/OnNavigationBarListener.java b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/OnNavigationBarListener.java
similarity index 66%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/OnNavigationBarListener.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/OnNavigationBarListener.java
index 5dbff08..95e2495 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/OnNavigationBarListener.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/OnNavigationBarListener.java
@@ -1,8 +1,8 @@
-package com.mifos.apache.fineract.ui.online.customers.createcustomer;
+package org.apache.fineract.ui.online.customers.createcustomer;
 
-import com.mifos.apache.fineract.data.models.customer.Address;
-import com.mifos.apache.fineract.data.models.customer.ContactDetail;
-import com.mifos.apache.fineract.data.models.customer.DateOfBirth;
+import org.apache.fineract.data.models.customer.Address;
+import org.apache.fineract.data.models.customer.ContactDetail;
+import org.apache.fineract.data.models.customer.DateOfBirth;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerActivity.java b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerActivity.java
similarity index 86%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerActivity.java
index 59d7755..236bd57 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerActivity.java
@@ -1,25 +1,26 @@
-package com.mifos.apache.fineract.ui.online.customers.createcustomer.customeractivity;
+package org.apache.fineract.ui.online.customers.createcustomer.customeractivity;
 
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Toast;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.Address;
-import com.mifos.apache.fineract.data.models.customer.ContactDetail;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.data.models.customer.DateOfBirth;
-import com.mifos.apache.fineract.ui.adapters.CreateCustomerStepAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.CustomerAction;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.OnNavigationBarListener;
-import com.mifos.apache.fineract.ui.online.customers.customerdetails.CustomerDetailsActivity;
-import com.mifos.apache.fineract.utils.ConstantKeys;
 import com.stepstone.stepper.StepperLayout;
 import com.stepstone.stepper.VerificationError;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.Address;
+import org.apache.fineract.data.models.customer.ContactDetail;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.data.models.customer.DateOfBirth;
+import org.apache.fineract.ui.adapters.CreateCustomerStepAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.online.customers.createcustomer.CustomerAction;
+import org.apache.fineract.ui.online.customers.createcustomer.OnNavigationBarListener;
+import org.apache.fineract.ui.online.customers.customerdetails.CustomerDetailsActivity;
+import org.apache.fineract.utils.ConstantKeys;
+
 import java.util.List;
 
 import javax.inject.Inject;

app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerContract.java b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerContract.java
similarity index 71%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerContract.java
index 10745c9..3fe0781 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.customers.createcustomer.customeractivity;
+package org.apache.fineract.ui.online.customers.createcustomer.customeractivity;
 
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.ui.base.MvpView;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerPresenter.java
similarity index 86%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerPresenter.java
index a54a77f..df12c6e 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/customeractivity/CreateCustomerPresenter.java
@@ -1,13 +1,13 @@
-package com.mifos.apache.fineract.ui.online.customers.createcustomer.customeractivity;
+package org.apache.fineract.ui.online.customers.createcustomer.customeractivity;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerCustomer;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerCustomer;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressContract.java b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressContract.java
similarity index 71%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressContract.java
index 3380883..d4f6ca6 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.customers.createcustomer.formcustomeraddress;
+package org.apache.fineract.ui.online.customers.createcustomer.formcustomeraddress;
 
-import com.mifos.apache.fineract.data.models.customer.Country;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.customer.Country;
+import org.apache.fineract.ui.base.MvpView;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressFragment.java
similarity index 93%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressFragment.java
index e356b10..9567b99 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.customers.createcustomer.formcustomeraddress;
+package org.apache.fineract.ui.online.customers.createcustomer.formcustomeraddress;
 
 import android.app.Activity;
 import android.content.Context;
@@ -16,18 +16,19 @@
 import android.widget.AutoCompleteTextView;
 import android.widget.EditText;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.Address;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.CustomerAction;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.OnNavigationBarListener;
-import com.mifos.apache.fineract.utils.ConstantKeys;
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.VerificationError;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.Address;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.online.customers.createcustomer.CustomerAction;
+import org.apache.fineract.ui.online.customers.createcustomer.OnNavigationBarListener;
+import org.apache.fineract.utils.ConstantKeys;
+
 import java.util.List;
 
 import javax.inject.Inject;

app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressPresenter.java
similarity index 87%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressPresenter.java
index 4bae271..7c274e9 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressPresenter.java
@@ -1,14 +1,15 @@
-package com.mifos.apache.fineract.ui.online.customers.createcustomer.formcustomeraddress;
+package org.apache.fineract.ui.online.customers.createcustomer.formcustomeraddress;
 
 import android.content.Context;
 
 import com.google.gson.Gson;
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerAnonymous;
-import com.mifos.apache.fineract.data.models.customer.Country;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerAnonymous;
+import org.apache.fineract.data.models.customer.Country;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesActivity.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesActivity.java
similarity index 71%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesActivity.java
index 5cd3649..54b149c 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesActivity.java
@@ -1,10 +1,10 @@
-package com.mifos.apache.fineract.ui.online.customers.customeractivities;
+package org.apache.fineract.ui.online.customers.customeractivities;
 
 import android.os.Bundle;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.R;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.utils.ConstantKeys;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesContract.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesContract.java
similarity index 75%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesContract.java
index c4267b6..da611d3 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.customers.customeractivities;
+package org.apache.fineract.ui.online.customers.customeractivities;
 
-import com.mifos.apache.fineract.data.models.customer.Command;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.customer.Command;
+import org.apache.fineract.ui.base.MvpView;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesFragment.java
similarity index 91%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesFragment.java
index 50cb935..6cf7ab9 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.customers.customeractivities;
+package org.apache.fineract.ui.online.customers.customeractivities;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -13,12 +13,12 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.Command;
-import com.mifos.apache.fineract.ui.adapters.CustomerActivitiesAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.Command;
+import org.apache.fineract.ui.adapters.CustomerActivitiesAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.utils.ConstantKeys;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesPresenter.java
similarity index 85%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesPresenter.java
index f820441..8f5f86f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesPresenter.java
@@ -1,13 +1,13 @@
-package com.mifos.apache.fineract.ui.online.customers.customeractivities;
+package org.apache.fineract.ui.online.customers.customeractivities;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerCustomer;
-import com.mifos.apache.fineract.data.models.customer.Command;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerCustomer;
+import org.apache.fineract.data.models.customer.Command;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsActivity.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsActivity.java
similarity index 85%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsActivity.java
index b6bc3cf..83c73e6 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsActivity.java
@@ -1,12 +1,12 @@
-package com.mifos.apache.fineract.ui.online.customers.customerdetails;
+package org.apache.fineract.ui.online.customers.customerdetails;
 
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.R;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.utils.ConstantKeys;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsContract.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsContract.java
similarity index 71%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsContract.java
index 54137ec..7da80c0 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsContract.java
@@ -1,8 +1,8 @@
-package com.mifos.apache.fineract.ui.online.customers.customerdetails;
+package org.apache.fineract.ui.online.customers.customerdetails;
 
-import com.mifos.apache.fineract.data.models.customer.ContactDetail;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.customer.ContactDetail;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.ui.base.MvpView;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java
similarity index 87%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java
index 0c50b8f..a23f2da 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.customers.customerdetails;
+package org.apache.fineract.ui.online.customers.customerdetails;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -15,29 +15,27 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.Address;
-import com.mifos.apache.fineract.data.models.customer.ContactDetail;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.CustomerAction;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.customeractivity
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.Address;
+import org.apache.fineract.data.models.customer.ContactDetail;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.online.customers.createcustomer.CustomerAction;
+import org.apache.fineract.ui.online.customers.createcustomer.customeractivity
         .CreateCustomerActivity;
-import com.mifos.apache.fineract.ui.online.customers.customeractivities.CustomerActivitiesActivity;
-import com.mifos.apache.fineract.ui.online.customers.customerprofile.CustomerProfileActivity;
-import com.mifos.apache.fineract.ui.online.customers.customertasks.CustomerTasksBottomSheetFragment;
-import com.mifos.apache.fineract.ui.online.customers.customertasks.OnTasksChangeListener;
-import com.mifos.apache.fineract.ui.online.depositaccounts.depositaccountslist
-        .DepositAccountsActivity;
-import com.mifos.apache.fineract.ui.online.identification.identificationlist
-        .IdentificationsActivity;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loanaccountlist.LoanAccountsActivity;
-import com.mifos.apache.fineract.ui.views.HeaderView;
-import com.mifos.apache.fineract.utils.ConstantKeys;
-import com.mifos.apache.fineract.utils.ImageLoaderUtils;
-import com.mifos.apache.fineract.utils.StatusUtils;
+import org.apache.fineract.ui.online.customers.customeractivities.CustomerActivitiesActivity;
+import org.apache.fineract.ui.online.customers.customerprofile.CustomerProfileActivity;
+import org.apache.fineract.ui.online.customers.customertasks.CustomerTasksBottomSheetFragment;
+import org.apache.fineract.ui.online.customers.customertasks.OnTasksChangeListener;
+import org.apache.fineract.ui.online.depositaccounts.depositaccountslist.DepositAccountsActivity;
+import org.apache.fineract.ui.online.identification.identificationlist.IdentificationsActivity;
+import org.apache.fineract.ui.online.loanaccounts.loanaccountlist.LoanAccountsActivity;
+import org.apache.fineract.ui.views.HeaderView;
+import org.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.utils.ImageLoaderUtils;
+import org.apache.fineract.utils.StatusUtils;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsPresenter.java
similarity index 84%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsPresenter.java
index deac39c..76bbefa 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsPresenter.java
@@ -1,12 +1,12 @@
-package com.mifos.apache.fineract.ui.online.customers.customerdetails;
+package org.apache.fineract.ui.online.customers.customerdetails;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.data.datamanager.DataManagerCustomer;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.data.datamanager.DataManagerCustomer;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerlist/CustomersContract.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersContract.java
similarity index 80%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerlist/CustomersContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersContract.java
index da99f77..57b24eb 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerlist/CustomersContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.customers.customerlist;
+package org.apache.fineract.ui.online.customers.customerlist;
 
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.ui.base.MvpView;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
similarity index 88%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
index edc4804..0e74b19 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.customers.customerlist;
+package org.apache.fineract.ui.online.customers.customerlist;
 
 import static android.app.Activity.RESULT_OK;
 
@@ -15,19 +15,19 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.ui.adapters.CustomerAdapter;
-import com.mifos.apache.fineract.ui.base.EndlessRecyclerViewScrollListener;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.ui.base.OnItemClickListener;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.CustomerAction;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.customeractivity
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.ui.adapters.CustomerAdapter;
+import org.apache.fineract.ui.base.EndlessRecyclerViewScrollListener;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.ui.base.OnItemClickListener;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.online.customers.createcustomer.CustomerAction;
+import org.apache.fineract.ui.online.customers.createcustomer.customeractivity
         .CreateCustomerActivity;
-import com.mifos.apache.fineract.ui.online.customers.customerdetails.CustomerDetailsActivity;
-import com.mifos.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.ui.online.customers.customerdetails.CustomerDetailsActivity;
+import org.apache.fineract.utils.ConstantKeys;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerlist/CustomersPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersPresenter.java
similarity index 87%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerlist/CustomersPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersPresenter.java
index 4277df7..0b2deb7 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerlist/CustomersPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersPresenter.java
@@ -1,14 +1,14 @@
-package com.mifos.apache.fineract.ui.online.customers.customerlist;
+package org.apache.fineract.ui.online.customers.customerlist;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerCustomer;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.data.models.customer.CustomerPage;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerCustomer;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.data.models.customer.CustomerPage;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/CustomerProfileActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/CustomerProfileActivity.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/CustomerProfileActivity.java
similarity index 89%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/CustomerProfileActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/CustomerProfileActivity.java
index d567d15..d129697 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/CustomerProfileActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/CustomerProfileActivity.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.customers.customerprofile;
+package org.apache.fineract.ui.online.customers.customerprofile;
 
 import android.Manifest;
 import android.content.Context;
@@ -16,16 +16,16 @@
 import android.view.MenuItem;
 import android.widget.ImageView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.ui.online.customers.customerprofile
-        .editcustomerprofilebottomsheet.EditCustomerProfileBottomSheet;
-import com.mifos.apache.fineract.ui.refreshcallback.RefreshProfileImage;
-import com.mifos.apache.fineract.utils.CheckSelfPermissionAndRequest;
-import com.mifos.apache.fineract.utils.ConstantKeys;
-import com.mifos.apache.fineract.utils.ImageLoaderUtils;
-import com.mifos.apache.fineract.utils.Utils;
+import org.apache.fineract.R;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.online.customers.customerprofile.editcustomerprofilebottomsheet
+        .EditCustomerProfileBottomSheet;
+import org.apache.fineract.ui.refreshcallback.RefreshProfileImage;
+import org.apache.fineract.utils.CheckSelfPermissionAndRequest;
+import org.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.utils.ImageLoaderUtils;
+import org.apache.fineract.utils.Utils;
 
 import java.io.ByteArrayOutputStream;
 

app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/CustomerProfileContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/CustomerProfileContract.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/CustomerProfileContract.java
similarity index 68%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/CustomerProfileContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/CustomerProfileContract.java
index fdc73a6..485d627 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/CustomerProfileContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/CustomerProfileContract.java
@@ -1,6 +1,6 @@
-package com.mifos.apache.fineract.ui.online.customers.customerprofile;
+package org.apache.fineract.ui.online.customers.customerprofile;
 
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.ui.base.MvpView;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditAction.java

diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditAction.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditAction.java
new file mode 100644
index 0000000..3b30a41
--- /dev/null
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditAction.java
@@ -0,0 +1,14 @@
+package org.apache.fineract.ui.online.customers.customerprofile.editcustomerprofilebottomsheet;
+
+/**
+ * @author Rajan Maurya
+ *         On 07/08/17.
+ */
+public enum  EditAction {
+
+    CAMERA,
+
+    GALLERY,
+
+    DELETE
+}

app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileBottomSheet.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileBottomSheet.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileBottomSheet.java
similarity index 94%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileBottomSheet.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileBottomSheet.java
index 15dd489..fa35d67 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileBottomSheet.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileBottomSheet.java
@@ -1,5 +1,4 @@
-package com.mifos.apache.fineract.ui.online.customers.customerprofile
-        .editcustomerprofilebottomsheet;
+package org.apache.fineract.ui.online.customers.customerprofile.editcustomerprofilebottomsheet;
 
 
 import android.Manifest;
@@ -24,15 +23,16 @@
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseBottomSheetDialogFragment;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.ui.refreshcallback.RefreshProfileImage;
-import com.mifos.apache.fineract.utils.CheckSelfPermissionAndRequest;
-import com.mifos.apache.fineract.utils.ConstantKeys;
-import com.mifos.apache.fineract.utils.FileUtils;
-import com.mifos.apache.fineract.utils.ImageLoaderUtils;
+
+import org.apache.fineract.R;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseBottomSheetDialogFragment;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.refreshcallback.RefreshProfileImage;
+import org.apache.fineract.utils.CheckSelfPermissionAndRequest;
+import org.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.utils.FileUtils;
+import org.apache.fineract.utils.ImageLoaderUtils;
 
 import java.io.File;
 

app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileContract.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileContract.java
similarity index 82%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileContract.java
index bb9a876..7ca8830 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.customers.customerprofile.editcustomerprofilebottomsheet;
+package org.apache.fineract.ui.online.customers.customerprofile.editcustomerprofilebottomsheet;
 
-import com.mifos.apache.fineract.ui.base.MvpView;
-import com.mifos.apache.fineract.ui.refreshcallback.RefreshProfileImage;
+import org.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.ui.refreshcallback.RefreshProfileImage;
 
 import java.io.File;
 

app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfilePresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfilePresenter.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfilePresenter.java
similarity index 89%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfilePresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfilePresenter.java
index e4b0d47..4d53808 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfilePresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfilePresenter.java
@@ -1,13 +1,13 @@
-package com.mifos.apache.fineract.ui.online.customers.customerprofile.editcustomerprofilebottomsheet;
+package org.apache.fineract.ui.online.customers.customerprofile.editcustomerprofilebottomsheet;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerCustomer;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
-import com.mifos.apache.fineract.utils.FileUtils;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerCustomer;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.utils.FileUtils;
 
 import java.io.File;
 

app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetContract.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetContract.java
similarity index 68%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetContract.java
index ea75421..438f0ee 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.customers.customertasks;
+package org.apache.fineract.ui.online.customers.customertasks;
 
-import com.mifos.apache.fineract.data.models.customer.Command;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.customer.Command;
+import org.apache.fineract.ui.base.MvpView;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetFragment.java
similarity index 94%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetFragment.java
index 9518d3c..3cbe5cf 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.customers.customertasks;
+package org.apache.fineract.ui.online.customers.customertasks;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -15,12 +15,12 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.Command;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseBottomSheetDialogFragment;
-import com.mifos.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.Command;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseBottomSheetDialogFragment;
+import org.apache.fineract.ui.base.Toaster;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetPresenter.java
similarity index 84%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetPresenter.java
index 56b59cf..f6af1b7 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetPresenter.java
@@ -1,12 +1,12 @@
-package com.mifos.apache.fineract.ui.online.customers.customertasks;
+package org.apache.fineract.ui.online.customers.customertasks;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.data.datamanager.DataManagerCustomer;
-import com.mifos.apache.fineract.data.models.customer.Command;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.data.datamanager.DataManagerCustomer;
+import org.apache.fineract.data.models.customer.Command;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/OnTasksChangeListener.java

diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/OnTasksChangeListener.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/OnTasksChangeListener.java
new file mode 100644
index 0000000..0451a89
--- /dev/null
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/OnTasksChangeListener.java
@@ -0,0 +1,12 @@
+package org.apache.fineract.ui.online.customers.customertasks;
+
+import org.apache.fineract.data.models.customer.Customer;
+
+/**
+ * @author Rajan Maurya
+ *         On 18/08/17.
+ */
+public interface OnTasksChangeListener {
+
+    void changeCustomerStatus(Customer.State state);
+}

app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/dashboard/DashboardContract.java b/app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardContract.java
similarity index 62%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/dashboard/DashboardContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardContract.java
index ba978ef..fa00f05 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/dashboard/DashboardContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardContract.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.dashboard;
+package org.apache.fineract.ui.online.dashboard;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/dashboard/DashboardFragment.java b/app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java
similarity index 73%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/dashboard/DashboardFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java
index cd40bbc..b4717c5 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/dashboard/DashboardFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.dashboard;
+package org.apache.fineract.ui.online.dashboard;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -7,14 +7,14 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.CustomerAction;
-import com.mifos.apache.fineract.ui.online.customers.createcustomer.customeractivity
+import org.apache.fineract.R;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.ui.online.customers.createcustomer.CustomerAction;
+import org.apache.fineract.ui.online.customers.createcustomer.customeractivity
         .CreateCustomerActivity;
-import com.mifos.apache.fineract.ui.online.customers.customerlist.CustomersFragment;
-import com.mifos.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.ui.online.customers.customerlist.CustomersFragment;
+import org.apache.fineract.utils.ConstantKeys;
 
 import butterknife.ButterKnife;
 import butterknife.OnClick;

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositAction.java

diff --git a/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositAction.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositAction.java
new file mode 100644
index 0000000..b8e6136
--- /dev/null
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositAction.java
@@ -0,0 +1,12 @@
+package org.apache.fineract.ui.online.depositaccounts.createdepositaccount;
+
+/**
+ * @author Rajan Maurya
+ *         On 13/08/17.
+ */
+public enum DepositAction {
+
+    CREATE,
+
+    EDIT
+}

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOnNavigationBarListener.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOnNavigationBarListener.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOnNavigationBarListener.java
similarity index 66%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOnNavigationBarListener.java
rename to app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOnNavigationBarListener.java
index 7f0c396..7f580c3 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOnNavigationBarListener.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOnNavigationBarListener.java
@@ -1,8 +1,8 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount;
+package org.apache.fineract.ui.online.depositaccounts.createdepositaccount;
 
 import android.support.annotation.Nullable;
 
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.data.models.deposit.DepositAccount;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOverViewContract.java

diff --git a/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOverViewContract.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOverViewContract.java
new file mode 100644
index 0000000..1e74bc0
--- /dev/null
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOverViewContract.java
@@ -0,0 +1,13 @@
+package org.apache.fineract.ui.online.depositaccounts.createdepositaccount;
+
+import org.apache.fineract.data.models.deposit.DepositAccount;
+
+/**
+ * @author Rajan Maurya
+ *         On 15/08/17.
+ */
+public interface DepositOverViewContract {
+
+    void setProductInstance(DepositAccount depositAccount, String productName,
+            DepositAction depositAction);
+}

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/FormDepositOverviewFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/FormDepositOverviewFragment.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/FormDepositOverviewFragment.java
similarity index 89%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/FormDepositOverviewFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/FormDepositOverviewFragment.java
index e19eb83..123492f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/FormDepositOverviewFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/FormDepositOverviewFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount;
+package org.apache.fineract.ui.online.depositaccounts.createdepositaccount;
 
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -11,14 +11,15 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.ui.adapters.BeneficiaryAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.VerificationError;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.ui.adapters.BeneficiaryAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositActivity.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositActivity.java
similarity index 86%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositActivity.java
index 6a35cb0..e0b752a 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositActivity.java
@@ -1,23 +1,22 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount
-        .createdepositactivity;
+package org.apache.fineract.ui.online.depositaccounts.createdepositaccount.createdepositactivity;
 
 import android.os.Bundle;
 import android.view.View;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.ui.adapters.CreateDepositStepAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount.DepositAction;
-import com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount
-        .DepositOnNavigationBarListener;
-import com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount
-        .DepositOverViewContract;
-import com.mifos.apache.fineract.utils.ConstantKeys;
 import com.stepstone.stepper.StepperLayout;
 import com.stepstone.stepper.VerificationError;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.ui.adapters.CreateDepositStepAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.online.depositaccounts.createdepositaccount.DepositAction;
+import org.apache.fineract.ui.online.depositaccounts.createdepositaccount
+        .DepositOnNavigationBarListener;
+import org.apache.fineract.ui.online.depositaccounts.createdepositaccount.DepositOverViewContract;
+import org.apache.fineract.utils.ConstantKeys;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositContract.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositContract.java
similarity index 70%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositContract.java
index 88a5f3e..7550476 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount.createdepositactivity;
+package org.apache.fineract.ui.online.depositaccounts.createdepositaccount.createdepositactivity;
 
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.ui.base.MvpView;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositPresenter.java
similarity index 87%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositPresenter.java
index 64b6bdf..2a5239b 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/createdepositactivity/CreateDepositPresenter.java
@@ -1,14 +1,13 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount
-        .createdepositactivity;
+package org.apache.fineract.ui.online.depositaccounts.createdepositaccount.createdepositactivity;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerDeposit;
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerDeposit;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductContract.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductContract.java
similarity index 69%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductContract.java
index feed424..9060124 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductContract.java
@@ -1,8 +1,8 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount.formdepositassignproduct;
+package org.apache.fineract.ui.online.depositaccounts.createdepositaccount.formdepositassignproduct;
 
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.data.models.deposit.ProductDefinition;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.data.models.deposit.ProductDefinition;
+import org.apache.fineract.ui.base.MvpView;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductFragment.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductFragment.java
similarity index 90%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductFragment.java
index f068532..c6ff5c8 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductFragment.java
@@ -1,5 +1,4 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount
-        .formdepositassignproduct;
+package org.apache.fineract.ui.online.depositaccounts.createdepositaccount.formdepositassignproduct;
 
 import android.app.Activity;
 import android.content.Context;
@@ -19,21 +18,22 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.ui.adapters.BeneficiaryAdapter;
-import com.mifos.apache.fineract.ui.adapters.BeneficiaryAutoCompleteAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount.DepositAction;
-import com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount
-        .DepositOnNavigationBarListener;
-import com.mifos.apache.fineract.ui.views.DelayAutoCompleteTextView;
-import com.mifos.apache.fineract.utils.ConstantKeys;
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.VerificationError;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.ui.adapters.BeneficiaryAdapter;
+import org.apache.fineract.ui.adapters.BeneficiaryAutoCompleteAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.ui.online.depositaccounts.createdepositaccount.DepositAction;
+import org.apache.fineract.ui.online.depositaccounts.createdepositaccount
+        .DepositOnNavigationBarListener;
+import org.apache.fineract.ui.views.DelayAutoCompleteTextView;
+import org.apache.fineract.utils.ConstantKeys;
+
 import java.util.ArrayList;
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductPresenter.java
similarity index 87%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductPresenter.java
index a7feaa6..2d00a10 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductPresenter.java
@@ -1,12 +1,12 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount.formdepositassignproduct;
+package org.apache.fineract.ui.online.depositaccounts.createdepositaccount.formdepositassignproduct;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.data.datamanager.DataManagerDeposit;
-import com.mifos.apache.fineract.data.models.deposit.ProductDefinition;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.data.datamanager.DataManagerDeposit;
+import org.apache.fineract.data.models.deposit.ProductDefinition;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsContract.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsContract.java
similarity index 68%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsContract.java
index 05d8bf3..8ebefd5 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.depositaccountdetails;
+package org.apache.fineract.ui.online.depositaccounts.depositaccountdetails;
 
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.ui.base.MvpView;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsFragment.java
similarity index 88%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsFragment.java
index d259856..195e080 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.depositaccountdetails;
+package org.apache.fineract.ui.online.depositaccounts.depositaccountdetails;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -12,16 +12,16 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount.DepositAction;
-import com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount
-        .createdepositactivity.CreateDepositActivity;
-import com.mifos.apache.fineract.utils.ConstantKeys;
-import com.mifos.apache.fineract.utils.StatusUtils;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.online.depositaccounts.createdepositaccount.DepositAction;
+import org.apache.fineract.ui.online.depositaccounts.createdepositaccount.createdepositactivity
+        .CreateDepositActivity;
+import org.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.utils.StatusUtils;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsPresenter.java
similarity index 84%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsPresenter.java
index c0a1b18..2b11a20 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsPresenter.java
@@ -1,13 +1,13 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.depositaccountdetails;
+package org.apache.fineract.ui.online.depositaccounts.depositaccountdetails;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerDeposit;
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerDeposit;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsActivity.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsActivity.java
similarity index 71%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsActivity.java
index 873deef..497442e 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsActivity.java
@@ -1,10 +1,10 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.depositaccountslist;
+package org.apache.fineract.ui.online.depositaccounts.depositaccountslist;
 
 import android.os.Bundle;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.R;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.utils.ConstantKeys;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsContract.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsContract.java
similarity index 74%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsContract.java
index 859d138..544cb63 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.depositaccountslist;
+package org.apache.fineract.ui.online.depositaccounts.depositaccountslist;
 
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.ui.base.MvpView;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsFragment.java
similarity index 85%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsFragment.java
index 3354e65..f1f1135 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.depositaccountslist;
+package org.apache.fineract.ui.online.depositaccounts.depositaccountslist;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -9,20 +9,20 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.ui.adapters.CustomerDepositAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.ui.base.OnItemClickListener;
-import com.mifos.apache.fineract.ui.uierrorhandler.MifosUIErrorHandler;
-import com.mifos.apache.fineract.ui.uierrorhandler.UIType;
-import com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount.DepositAction;
-import com.mifos.apache.fineract.ui.online.depositaccounts.createdepositaccount
-        .createdepositactivity.CreateDepositActivity;
-import com.mifos.apache.fineract.ui.online.depositaccounts.depositaccountdetails
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.ui.adapters.CustomerDepositAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.ui.base.OnItemClickListener;
+import org.apache.fineract.ui.online.depositaccounts.createdepositaccount.DepositAction;
+import org.apache.fineract.ui.online.depositaccounts.createdepositaccount.createdepositactivity
+        .CreateDepositActivity;
+import org.apache.fineract.ui.online.depositaccounts.depositaccountdetails
         .DepositAccountDetailsFragment;
-import com.mifos.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.ui.uierrorhandler.MifosUIErrorHandler;
+import org.apache.fineract.ui.uierrorhandler.UIType;
+import org.apache.fineract.utils.ConstantKeys;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsPresenter.java
similarity index 85%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsPresenter.java
index 990e877..1e28756 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsPresenter.java
@@ -1,13 +1,13 @@
-package com.mifos.apache.fineract.ui.online.depositaccounts.depositaccountslist;
+package org.apache.fineract.ui.online.depositaccounts.depositaccountslist;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerDeposit;
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerDeposit;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/Action.java

diff --git a/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/Action.java b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/Action.java
new file mode 100644
index 0000000..2c7e68c
--- /dev/null
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/Action.java
@@ -0,0 +1,12 @@
+package org.apache.fineract.ui.online.identification.createidentification;
+
+/**
+ * @author Rajan Maurya
+ *         On 04/08/17.
+ */
+public enum  Action {
+
+    CREATE,
+
+    EDIT
+}

app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormIdentificationDetailsFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/FormIdentificationDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormIdentificationDetailsFragment.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/FormIdentificationDetailsFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormIdentificationDetailsFragment.java
index 214332f..5663f0c 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/FormIdentificationDetailsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormIdentificationDetailsFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.identification.createidentification;
+package org.apache.fineract.ui.online.identification.createidentification;
 
 import android.app.Activity;
 import android.app.DatePickerDialog;
@@ -16,14 +16,15 @@
 import android.widget.DatePicker;
 import android.widget.EditText;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.identification.ExpirationDate;
-import com.mifos.apache.fineract.data.models.customer.identification.Identification;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.utils.ConstantKeys;
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.VerificationError;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.identification.ExpirationDate;
+import org.apache.fineract.data.models.customer.identification.Identification;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.utils.ConstantKeys;
+
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Locale;

app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormOverViewIdentificationFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/FormOverViewIdentificationFragment.java b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormOverViewIdentificationFragment.java
similarity index 90%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/FormOverViewIdentificationFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormOverViewIdentificationFragment.java
index 9e50813..a5a1934 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/FormOverViewIdentificationFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormOverViewIdentificationFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.identification.createidentification;
+package org.apache.fineract.ui.online.identification.createidentification;
 
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -8,12 +8,13 @@
 import android.view.ViewGroup;
 import android.widget.EditText;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.identification.Identification;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.VerificationError;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.identification.Identification;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Locale;

app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/OnNavigationBarListener.java

diff --git a/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/OnNavigationBarListener.java b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/OnNavigationBarListener.java
new file mode 100644
index 0000000..193be9d
--- /dev/null
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/OnNavigationBarListener.java
@@ -0,0 +1,15 @@
+package org.apache.fineract.ui.online.identification.createidentification;
+
+
+import org.apache.fineract.data.models.customer.identification.Identification;
+
+/**
+ * @author Rajan Maurya
+ *         On 17/07/17.
+ */
+public interface OnNavigationBarListener {
+
+    interface IdentificationCard {
+        void setIdentificationDetails(Identification identificationDetails);
+    }
+}

app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/OverViewContract.java

diff --git a/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/OverViewContract.java b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/OverViewContract.java
new file mode 100644
index 0000000..46186b4
--- /dev/null
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/OverViewContract.java
@@ -0,0 +1,12 @@
+package org.apache.fineract.ui.online.identification.createidentification;
+
+import org.apache.fineract.data.models.customer.identification.Identification;
+
+/**
+ * @author Rajan Maurya
+ *         On 31/07/17.
+ */
+public interface OverViewContract {
+
+    void setIdentification(Identification identification);
+}

app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationActivity.java b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationActivity.java
similarity index 87%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationActivity.java
index 88d778f..456c5c9 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationActivity.java
@@ -1,5 +1,4 @@
-package com.mifos.apache.fineract.ui.online.identification.createidentification
-        .identificationactivity;
+package org.apache.fineract.ui.online.identification.createidentification.identificationactivity;
 
 
 import android.app.Activity;
@@ -7,19 +6,19 @@
 import android.os.Bundle;
 import android.view.View;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.identification.Identification;
-import com.mifos.apache.fineract.ui.adapters.CreateIdentificationStepAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.ui.online.identification.createidentification.Action;
-import com.mifos.apache.fineract.ui.online.identification.createidentification
-        .OnNavigationBarListener;
-import com.mifos.apache.fineract.ui.online.identification.createidentification.OverViewContract;
-import com.mifos.apache.fineract.utils.ConstantKeys;
 import com.stepstone.stepper.StepperLayout;
 import com.stepstone.stepper.VerificationError;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.identification.Identification;
+import org.apache.fineract.ui.adapters.CreateIdentificationStepAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.online.identification.createidentification.Action;
+import org.apache.fineract.ui.online.identification.createidentification.OnNavigationBarListener;
+import org.apache.fineract.ui.online.identification.createidentification.OverViewContract;
+import org.apache.fineract.utils.ConstantKeys;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;

app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationContract.java b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationContract.java
similarity index 71%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationContract.java
index 6601f5b..26a5204 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationContract.java
@@ -1,8 +1,7 @@
-package com.mifos.apache.fineract.ui.online.identification.createidentification
-        .identificationactivity;
+package org.apache.fineract.ui.online.identification.createidentification.identificationactivity;
 
-import com.mifos.apache.fineract.data.models.customer.identification.Identification;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.customer.identification.Identification;
+import org.apache.fineract.ui.base.MvpView;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationPresenter.java
similarity index 87%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationPresenter.java
index 031780d..2a08bca 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/identificationactivity/CreateIdentificationPresenter.java
@@ -1,15 +1,14 @@
-package com.mifos.apache.fineract.ui.online.identification.createidentification
-        .identificationactivity;
+package org.apache.fineract.ui.online.identification.createidentification.identificationactivity;
 
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerCustomer;
-import com.mifos.apache.fineract.data.models.customer.identification.Identification;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerCustomer;
+import org.apache.fineract.data.models.customer.identification.Identification;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsContract.java b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsContract.java
similarity index 82%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsContract.java
index 7906f80..cb91b44 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.identification.identificationdetails;
+package org.apache.fineract.ui.online.identification.identificationdetails;
 
-import com.mifos.apache.fineract.data.models.customer.identification.ScanCard;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.customer.identification.ScanCard;
+import org.apache.fineract.ui.base.MvpView;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsFragment.java
similarity index 90%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsFragment.java
index b966445..53e7721 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.identification.identificationdetails;
+package org.apache.fineract.ui.online.identification.identificationdetails;
 
 import android.app.Activity;
 import android.content.DialogInterface;
@@ -18,24 +18,25 @@
 import android.widget.Toast;
 
 import com.google.gson.Gson;
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.identification.Identification;
-import com.mifos.apache.fineract.data.models.customer.identification.ScanCard;
-import com.mifos.apache.fineract.ui.adapters.IdentificationScanAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.ui.online.identification.createidentification.Action;
-import com.mifos.apache.fineract.ui.online.identification.createidentification
-        .identificationactivity.CreateIdentificationActivity;
-import com.mifos.apache.fineract.ui.online.identification.uploadidentificationscan
+
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.identification.Identification;
+import org.apache.fineract.data.models.customer.identification.ScanCard;
+import org.apache.fineract.ui.adapters.IdentificationScanAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.ui.online.identification.createidentification.Action;
+import org.apache.fineract.ui.online.identification.createidentification.identificationactivity
+        .CreateIdentificationActivity;
+import org.apache.fineract.ui.online.identification.uploadidentificationscan
         .AddScanIdentificationListener;
-import com.mifos.apache.fineract.ui.online.identification.uploadidentificationscan
+import org.apache.fineract.ui.online.identification.uploadidentificationscan
         .UploadIdentificationCardBottomSheet;
-import com.mifos.apache.fineract.ui.online.identification.viewscancard.ViewScanCardActivity;
-import com.mifos.apache.fineract.utils.ConstantKeys;
-import com.mifos.apache.fineract.utils.DateUtils;
-import com.mifos.apache.fineract.utils.MaterialDialog;
-import com.mifos.apache.fineract.utils.Utils;
+import org.apache.fineract.ui.online.identification.viewscancard.ViewScanCardActivity;
+import org.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.utils.DateUtils;
+import org.apache.fineract.utils.MaterialDialog;
+import org.apache.fineract.utils.Utils;
 
 import java.util.Calendar;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsPresenter.java
similarity index 91%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsPresenter.java
index c5a3a4f..e68813b 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsPresenter.java
@@ -1,13 +1,13 @@
-package com.mifos.apache.fineract.ui.online.identification.identificationdetails;
+package org.apache.fineract.ui.online.identification.identificationdetails;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerCustomer;
-import com.mifos.apache.fineract.data.models.customer.identification.ScanCard;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerCustomer;
+import org.apache.fineract.data.models.customer.identification.ScanCard;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationlist/IdentificationsActivity.java b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsActivity.java
similarity index 71%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationlist/IdentificationsActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsActivity.java
index 64f8348..4e4d93b 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationlist/IdentificationsActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsActivity.java
@@ -1,10 +1,10 @@
-package com.mifos.apache.fineract.ui.online.identification.identificationlist;
+package org.apache.fineract.ui.online.identification.identificationlist;
 
 import android.os.Bundle;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.R;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.utils.ConstantKeys;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationlist/IdentificationsContract.java b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsContract.java
similarity index 71%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationlist/IdentificationsContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsContract.java
index 9dcf9e0..5cff8db 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationlist/IdentificationsContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.identification.identificationlist;
+package org.apache.fineract.ui.online.identification.identificationlist;
 
-import com.mifos.apache.fineract.data.models.customer.identification.Identification;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.customer.identification.Identification;
+import org.apache.fineract.ui.base.MvpView;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java
similarity index 85%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java
index b887aa2..cfc0b95 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.identification.identificationlist;
+package org.apache.fineract.ui.online.identification.identificationlist;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -12,19 +12,19 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.identification.Identification;
-import com.mifos.apache.fineract.ui.adapters.IdentificationAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.ui.base.OnItemClickListener;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.ui.online.identification.createidentification.Action;
-import com.mifos.apache.fineract.ui.online.identification.createidentification
-        .identificationactivity.CreateIdentificationActivity;
-import com.mifos.apache.fineract.ui.online.identification.identificationdetails
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.identification.Identification;
+import org.apache.fineract.ui.adapters.IdentificationAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.ui.base.OnItemClickListener;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.online.identification.createidentification.Action;
+import org.apache.fineract.ui.online.identification.createidentification.identificationactivity
+        .CreateIdentificationActivity;
+import org.apache.fineract.ui.online.identification.identificationdetails
         .IdentificationDetailsFragment;
-import com.mifos.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.utils.ConstantKeys;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationlist/IdentificationsPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsPresenter.java
similarity index 84%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationlist/IdentificationsPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsPresenter.java
index 92fd12d..74ba678 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/identificationlist/IdentificationsPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsPresenter.java
@@ -1,13 +1,13 @@
-package com.mifos.apache.fineract.ui.online.identification.identificationlist;
+package org.apache.fineract.ui.online.identification.identificationlist;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerCustomer;
-import com.mifos.apache.fineract.data.models.customer.identification.Identification;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerCustomer;
+import org.apache.fineract.data.models.customer.identification.Identification;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/AddScanIdentificationListener.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/uploadidentificationscan/AddScanIdentificationListener.java b/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/AddScanIdentificationListener.java
similarity index 64%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/uploadidentificationscan/AddScanIdentificationListener.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/AddScanIdentificationListener.java
index 1b57f87..4c811a4 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/uploadidentificationscan/AddScanIdentificationListener.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/AddScanIdentificationListener.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.identification.uploadidentificationscan;
+package org.apache.fineract.ui.online.identification.uploadidentificationscan;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardBottomSheet.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardBottomSheet.java b/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardBottomSheet.java
similarity index 93%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardBottomSheet.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardBottomSheet.java
index 7450ec9..aed9b97 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardBottomSheet.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardBottomSheet.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.identification.uploadidentificationscan;
+package org.apache.fineract.ui.online.identification.uploadidentificationscan;
 
 import static android.app.Activity.RESULT_OK;
 
@@ -22,14 +22,14 @@
 import android.view.View;
 import android.widget.EditText;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseBottomSheetDialogFragment;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.utils.CheckSelfPermissionAndRequest;
-import com.mifos.apache.fineract.utils.ConstantKeys;
-import com.mifos.apache.fineract.utils.ValidateIdentifierUtil;
-import com.mifos.apache.fineract.utils.ValidationUtil;
+import org.apache.fineract.R;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseBottomSheetDialogFragment;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.utils.CheckSelfPermissionAndRequest;
+import org.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.utils.ValidateIdentifierUtil;
+import org.apache.fineract.utils.ValidationUtil;
 
 import java.io.File;
 import java.io.FileOutputStream;

app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardContract.java b/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardContract.java
similarity index 86%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardContract.java
index 1a2edc7..03e0c3a 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardContract.java
@@ -1,8 +1,8 @@
-package com.mifos.apache.fineract.ui.online.identification.uploadidentificationscan;
+package org.apache.fineract.ui.online.identification.uploadidentificationscan;
 
 import android.graphics.Bitmap;
 
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.ui.base.MvpView;
 
 import java.io.File;
 

app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardPresenter.java
similarity index 87%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardPresenter.java
index 74a6901..613ed4b 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardPresenter.java
@@ -1,12 +1,12 @@
-package com.mifos.apache.fineract.ui.online.identification.uploadidentificationscan;
+package org.apache.fineract.ui.online.identification.uploadidentificationscan;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerCustomer;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerCustomer;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import java.io.File;
 

app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/viewscancard/ViewScanCardActivity.java b/app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardActivity.java
similarity index 83%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/viewscancard/ViewScanCardActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardActivity.java
index 3ac28c8..69eaca1 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/viewscancard/ViewScanCardActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardActivity.java
@@ -1,15 +1,16 @@
-package com.mifos.apache.fineract.ui.online.identification.viewscancard;
+package org.apache.fineract.ui.online.identification.viewscancard;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 
 import com.google.gson.reflect.TypeToken;
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.identification.ScanCard;
-import com.mifos.apache.fineract.ui.adapters.ViewPagerAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.utils.ConstantKeys;
-import com.mifos.apache.fineract.utils.Utils;
+
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.identification.ScanCard;
+import org.apache.fineract.ui.adapters.ViewPagerAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.utils.Utils;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/viewscancard/ViewScanCardFragment.java b/app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardFragment.java
similarity index 88%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/identification/viewscancard/ViewScanCardFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardFragment.java
index 8e367ca..4ce807f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/identification/viewscancard/ViewScanCardFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.identification.viewscancard;
+package org.apache.fineract.ui.online.identification.viewscancard;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -7,10 +7,10 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.utils.ConstantKeys;
-import com.mifos.apache.fineract.utils.ImageLoaderUtils;
+import org.apache.fineract.R;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.utils.ImageLoaderUtils;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;

app/src/main/java/org/apache/fineract/ui/online/launcher/LauncherActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/launcher/LauncherActivity.java b/app/src/main/java/org/apache/fineract/ui/online/launcher/LauncherActivity.java
similarity index 83%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/launcher/LauncherActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/launcher/LauncherActivity.java
index 232aeef..83bcdd9 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/launcher/LauncherActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/launcher/LauncherActivity.java
@@ -1,16 +1,16 @@
-package com.mifos.apache.fineract.ui.online.launcher;
+package org.apache.fineract.ui.online.launcher;
 
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.local.PreferenceKey;
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
-import com.mifos.apache.fineract.data.models.Authentication;
-import com.mifos.apache.fineract.ui.online.DashboardActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.online.login.LoginActivity;
-import com.mifos.apache.fineract.utils.DateUtils;
+import org.apache.fineract.R;
+import org.apache.fineract.data.local.PreferenceKey;
+import org.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.data.models.Authentication;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.online.DashboardActivity;
+import org.apache.fineract.ui.online.login.LoginActivity;
+import org.apache.fineract.utils.DateUtils;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/launcher/LauncherContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/launcher/LauncherContract.java b/app/src/main/java/org/apache/fineract/ui/online/launcher/LauncherContract.java
similarity index 74%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/launcher/LauncherContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/launcher/LauncherContract.java
index 9e2e460..694f633 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/launcher/LauncherContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/launcher/LauncherContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.launcher;
+package org.apache.fineract.ui.online.launcher;
 
-import com.mifos.apache.fineract.data.models.Authentication;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.Authentication;
+import org.apache.fineract.ui.base.MvpView;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/launcher/LauncherPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/launcher/LauncherPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/launcher/LauncherPresenter.java
similarity index 83%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/launcher/LauncherPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/launcher/LauncherPresenter.java
index 6434e26..c473b0e 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/launcher/LauncherPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/launcher/LauncherPresenter.java
@@ -1,12 +1,12 @@
-package com.mifos.apache.fineract.ui.online.launcher;
+package org.apache.fineract.ui.online.launcher;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.data.datamanager.DataManagerAuth;
-import com.mifos.apache.fineract.data.models.Authentication;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.data.datamanager.DataManagerAuth;
+import org.apache.fineract.data.models.Authentication;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportActivity.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportActivity.java
similarity index 88%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportActivity.java
index d62a3bd..b45b3f2 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportActivity.java
@@ -1,17 +1,18 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.debtincomereport;
+package org.apache.fineract.ui.online.loanaccounts.debtincomereport;
 
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 
 import com.google.gson.reflect.TypeToken;
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.loan.CreditWorthinessFactor;
-import com.mifos.apache.fineract.data.models.loan.CreditWorthinessSnapshot;
-import com.mifos.apache.fineract.ui.adapters.ViewPagerAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.utils.ConstantKeys;
-import com.mifos.apache.fineract.utils.Utils;
+
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.loan.CreditWorthinessFactor;
+import org.apache.fineract.data.models.loan.CreditWorthinessSnapshot;
+import org.apache.fineract.ui.adapters.ViewPagerAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.utils.Utils;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportFragment.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportFragment.java
similarity index 88%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportFragment.java
index c762b24..290ac74 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.debtincomereport;
+package org.apache.fineract.ui.online.loanaccounts.debtincomereport;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -10,14 +10,14 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.loan.CreditWorthinessFactor;
-import com.mifos.apache.fineract.data.models.loan.CreditWorthinessSnapshot;
-import com.mifos.apache.fineract.ui.adapters.DebtIncomeReportAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.utils.ConstantKeys;
-import com.mifos.apache.fineract.utils.Utils;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.loan.CreditWorthinessFactor;
+import org.apache.fineract.data.models.loan.CreditWorthinessSnapshot;
+import org.apache.fineract.ui.adapters.DebtIncomeReportAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.utils.Utils;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsActivity.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsActivity.java
similarity index 71%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsActivity.java
index 45b3367..318c082 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsActivity.java
@@ -1,10 +1,10 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanaccountlist;
+package org.apache.fineract.ui.online.loanaccounts.loanaccountlist;
 
 import android.os.Bundle;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.R;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.utils.ConstantKeys;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsContract.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsContract.java
similarity index 82%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsContract.java
index d4ee0bd..0c42588 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanaccountlist;
+package org.apache.fineract.ui.online.loanaccounts.loanaccountlist;
 
-import com.mifos.apache.fineract.data.models.loan.LoanAccount;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.loan.LoanAccount;
+import org.apache.fineract.ui.base.MvpView;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java
similarity index 88%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java
index 9cfacbf..3929d6c 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanaccountlist;
+package org.apache.fineract.ui.online.loanaccounts.loanaccountlist;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -12,17 +12,18 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.loan.LoanAccount;
-import com.mifos.apache.fineract.ui.adapters.LoanAccountListAdapter;
-import com.mifos.apache.fineract.ui.base.EndlessRecyclerViewScrollListener;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.ui.base.OnItemClickListener;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loanactivity.LoanApplicationActivity;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loandetails.CustomerLoanDetailsFragment;
-import com.mifos.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.loan.LoanAccount;
+import org.apache.fineract.ui.adapters.LoanAccountListAdapter;
+import org.apache.fineract.ui.base.EndlessRecyclerViewScrollListener;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.ui.base.OnItemClickListener;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.online.loanaccounts.loanapplication.loanactivity
+        .LoanApplicationActivity;
+import org.apache.fineract.ui.online.loanaccounts.loandetails.CustomerLoanDetailsFragment;
+import org.apache.fineract.utils.ConstantKeys;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsPresenter.java
similarity index 88%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsPresenter.java
index 8c7f303..5a942f2 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsPresenter.java
@@ -1,14 +1,14 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanaccountlist;
+package org.apache.fineract.ui.online.loanaccounts.loanaccountlist;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerLoans;
-import com.mifos.apache.fineract.data.models.loan.LoanAccount;
-import com.mifos.apache.fineract.data.models.loan.LoanAccountPage;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerLoans;
+import org.apache.fineract.data.models.loan.LoanAccount;
+import org.apache.fineract.data.models.loan.LoanAccountPage;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/AddDebtIncomeBottomSheet.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/AddDebtIncomeBottomSheet.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/AddDebtIncomeBottomSheet.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/AddDebtIncomeBottomSheet.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/AddDebtIncomeBottomSheet.java
index bbd20c2..7955e28 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/AddDebtIncomeBottomSheet.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/AddDebtIncomeBottomSheet.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication;
+package org.apache.fineract.ui.online.loanaccounts.loanapplication;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -13,9 +13,9 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.loan.CreditWorthinessFactor;
-import com.mifos.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.loan.CreditWorthinessFactor;
+import org.apache.fineract.ui.base.Toaster;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/BaseFragmentDebtIncome.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/BaseFragmentDebtIncome.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/BaseFragmentDebtIncome.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/BaseFragmentDebtIncome.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/BaseFragmentDebtIncome.java
index 5a787ff..174a9b5 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/BaseFragmentDebtIncome.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/BaseFragmentDebtIncome.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication;
+package org.apache.fineract.ui.online.loanaccounts.loanapplication;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -9,12 +9,12 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.loan.CreditWorthinessFactor;
-import com.mifos.apache.fineract.data.models.loan.CreditWorthinessSnapshot;
-import com.mifos.apache.fineract.ui.adapters.LoanDebtIncomeAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.loan.CreditWorthinessFactor;
+import org.apache.fineract.data.models.loan.CreditWorthinessSnapshot;
+import org.apache.fineract.ui.adapters.LoanDebtIncomeAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/CreditWorthinessSource.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/CreditWorthinessSource.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/CreditWorthinessSource.java
similarity index 67%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/CreditWorthinessSource.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/CreditWorthinessSource.java
index cbbf932..aff3ff6 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/CreditWorthinessSource.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/CreditWorthinessSource.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication;
+package org.apache.fineract.ui.online.loanaccounts.loanapplication;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/LoanDebtIncomeFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/LoanDebtIncomeFragment.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/LoanDebtIncomeFragment.java
similarity index 93%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/LoanDebtIncomeFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/LoanDebtIncomeFragment.java
index 8fa44f5..30cd9ee 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/LoanDebtIncomeFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/LoanDebtIncomeFragment.java
@@ -1,14 +1,15 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication;
+package org.apache.fineract.ui.online.loanaccounts.loanapplication;
 
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 
-import com.mifos.apache.fineract.R;
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.VerificationError;
 
+import org.apache.fineract.R;
+
 /**
  * @author Rajan Maurya
  *         On 24/07/17.

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/OnBottomSheetDialogListener.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/OnBottomSheetDialogListener.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/OnBottomSheetDialogListener.java
similarity index 76%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/OnBottomSheetDialogListener.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/OnBottomSheetDialogListener.java
index 9d6e3ad..e864a6f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/OnBottomSheetDialogListener.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/OnBottomSheetDialogListener.java
@@ -1,6 +1,6 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication;
+package org.apache.fineract.ui.online.loanaccounts.loanapplication;
 
-import com.mifos.apache.fineract.data.models.loan.CreditWorthinessFactor;
+import org.apache.fineract.data.models.loan.CreditWorthinessFactor;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/OnNavigationBarListener.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/OnNavigationBarListener.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/OnNavigationBarListener.java
similarity index 66%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/OnNavigationBarListener.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/OnNavigationBarListener.java
index d44724c..b2fcbde 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/OnNavigationBarListener.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/OnNavigationBarListener.java
@@ -1,9 +1,9 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication;
+package org.apache.fineract.ui.online.loanaccounts.loanapplication;
 
-import com.mifos.apache.fineract.data.models.loan.CreditWorthinessSnapshot;
-import com.mifos.apache.fineract.data.models.loan.LoanAccount;
-import com.mifos.apache.fineract.data.models.loan.PaymentCycle;
-import com.mifos.apache.fineract.data.models.loan.TermRange;
+import org.apache.fineract.data.models.loan.CreditWorthinessSnapshot;
+import org.apache.fineract.data.models.loan.LoanAccount;
+import org.apache.fineract.data.models.loan.PaymentCycle;
+import org.apache.fineract.data.models.loan.TermRange;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationActivity.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationActivity.java
similarity index 86%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationActivity.java
index b7f86e4..416df04 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationActivity.java
@@ -1,24 +1,25 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loanactivity;
+package org.apache.fineract.ui.online.loanaccounts.loanapplication.loanactivity;
 
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 
 import com.google.gson.Gson;
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.loan.CreditWorthinessSnapshot;
-import com.mifos.apache.fineract.data.models.loan.LoanAccount;
-import com.mifos.apache.fineract.data.models.loan.LoanParameters;
-import com.mifos.apache.fineract.data.models.loan.PaymentCycle;
-import com.mifos.apache.fineract.data.models.loan.TermRange;
-import com.mifos.apache.fineract.ui.adapters.LoanApplicationStepAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.OnNavigationBarListener;
-import com.mifos.apache.fineract.utils.ConstantKeys;
 import com.stepstone.stepper.StepperLayout;
 import com.stepstone.stepper.VerificationError;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.loan.CreditWorthinessSnapshot;
+import org.apache.fineract.data.models.loan.LoanAccount;
+import org.apache.fineract.data.models.loan.LoanParameters;
+import org.apache.fineract.data.models.loan.PaymentCycle;
+import org.apache.fineract.data.models.loan.TermRange;
+import org.apache.fineract.ui.adapters.LoanApplicationStepAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.online.loanaccounts.loanapplication.OnNavigationBarListener;
+import org.apache.fineract.utils.ConstantKeys;
+
 import java.util.ArrayList;
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationContract.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationContract.java
similarity index 68%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationContract.java
index 149579f..753d63e 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loanactivity;
+package org.apache.fineract.ui.online.loanaccounts.loanapplication.loanactivity;
 
-import com.mifos.apache.fineract.data.models.loan.LoanAccount;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.loan.LoanAccount;
+import org.apache.fineract.ui.base.MvpView;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationPresenter.java
similarity index 83%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationPresenter.java
index ac6fb8c..7069853 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loanactivity/LoanApplicationPresenter.java
@@ -1,13 +1,13 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loanactivity;
+package org.apache.fineract.ui.online.loanaccounts.loanapplication.loanactivity;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerLoans;
-import com.mifos.apache.fineract.data.models.loan.LoanAccount;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerLoans;
+import org.apache.fineract.data.models.loan.LoanAccount;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerContract.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerContract.java
similarity index 72%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerContract.java
index 4bd6a2f..8b0f2d6 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loancosigner;
+package org.apache.fineract.ui.online.loanaccounts.loanapplication.loancosigner;
 
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.ui.base.MvpView;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerFragment.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerFragment.java
similarity index 88%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerFragment.java
index b4801c7..a02da84 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loancosigner;
+package org.apache.fineract.ui.online.loanaccounts.loanapplication.loancosigner;
 
 import android.app.Activity;
 import android.content.Context;
@@ -11,15 +11,16 @@
 import android.widget.AutoCompleteTextView;
 import android.widget.ImageView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.loan.CreditWorthinessSnapshot;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.BaseFragmentDebtIncome;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.OnNavigationBarListener;
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.VerificationError;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.loan.CreditWorthinessSnapshot;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.online.loanaccounts.loanapplication.BaseFragmentDebtIncome;
+import org.apache.fineract.ui.online.loanaccounts.loanapplication.OnNavigationBarListener;
+
 import java.util.List;
 
 import javax.inject.Inject;

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerPresenter.java
similarity index 82%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerPresenter.java
index 0151f28..9196a3b 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerPresenter.java
@@ -1,14 +1,14 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loancosigner;
+package org.apache.fineract.ui.online.loanaccounts.loanapplication.loancosigner;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerCustomer;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.data.models.customer.CustomerPage;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerCustomer;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.data.models.customer.CustomerPage;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import java.util.List;
 
@@ -93,9 +93,9 @@
     }
 
     @Override
-    public Boolean findCustomer(final String customer, String [] customers) {
+    public Boolean findCustomer(final String customer, String[] customers) {
         boolean isCustomerPresent = false;
-        for (String s :  customers) {
+        for (String s : customers) {
             if (s.equals(customer)) {
                 isCustomerPresent = true;
             }

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsContract.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsContract.java
similarity index 81%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsContract.java
index 724ecb6..f591509 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loandetails;
+package org.apache.fineract.ui.online.loanaccounts.loanapplication.loandetails;
 
-import com.mifos.apache.fineract.data.models.product.Product;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.product.Product;
+import org.apache.fineract.ui.base.MvpView;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsFragment.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsFragment.java
index 12048a1..4be3574 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loandetails;
+package org.apache.fineract.ui.online.loanaccounts.loanapplication.loandetails;
 
 import android.app.Activity;
 import android.content.Context;
@@ -19,21 +19,22 @@
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.loan.LoanAccount;
-import com.mifos.apache.fineract.data.models.loan.PaymentCycle;
-import com.mifos.apache.fineract.data.models.loan.TermRange;
-import com.mifos.apache.fineract.data.models.product.Product;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.OnNavigationBarListener;
-import com.mifos.apache.fineract.utils.Utils;
-import com.mifos.apache.fineract.utils.ValidateIdentifierUtil;
-import com.mifos.apache.fineract.utils.ValidationUtil;
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.VerificationError;
 
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.loan.LoanAccount;
+import org.apache.fineract.data.models.loan.PaymentCycle;
+import org.apache.fineract.data.models.loan.TermRange;
+import org.apache.fineract.data.models.product.Product;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.online.loanaccounts.loanapplication.OnNavigationBarListener;
+import org.apache.fineract.utils.Utils;
+import org.apache.fineract.utils.ValidateIdentifierUtil;
+import org.apache.fineract.utils.ValidationUtil;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsPresenter.java
similarity index 87%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsPresenter.java
index 4174241..44cfcc2 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsPresenter.java
@@ -1,14 +1,14 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loanapplication.loandetails;
+package org.apache.fineract.ui.online.loanaccounts.loanapplication.loandetails;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerLoans;
-import com.mifos.apache.fineract.data.models.product.Product;
-import com.mifos.apache.fineract.data.models.product.ProductPage;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerLoans;
+import org.apache.fineract.data.models.product.Product;
+import org.apache.fineract.data.models.product.ProductPage;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsContract.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsContract.java
similarity index 70%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsContract.java
index 29f4bf3..08e0704 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loandetails;
+package org.apache.fineract.ui.online.loanaccounts.loandetails;
 
-import com.mifos.apache.fineract.data.models.loan.LoanAccount;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.loan.LoanAccount;
+import org.apache.fineract.ui.base.MvpView;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java
similarity index 92%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java
index 7c2d0f2..961e49a 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loandetails;
+package org.apache.fineract.ui.online.loanaccounts.loandetails;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -15,18 +15,19 @@
 import android.widget.TextView;
 
 import com.google.gson.Gson;
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.loan.LoanAccount;
-import com.mifos.apache.fineract.data.models.loan.PaymentCycle;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.ui.online.loanaccounts.debtincomereport.DebtIncomeReportActivity;
-import com.mifos.apache.fineract.ui.online.loanaccounts.plannedpayment.PlannedPaymentActivity;
-import com.mifos.apache.fineract.utils.ConstantKeys;
-import com.mifos.apache.fineract.utils.DateUtils;
-import com.mifos.apache.fineract.utils.StatusUtils;
-import com.mifos.apache.fineract.utils.Utils;
+
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.loan.LoanAccount;
+import org.apache.fineract.data.models.loan.PaymentCycle;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.ui.online.loanaccounts.debtincomereport.DebtIncomeReportActivity;
+import org.apache.fineract.ui.online.loanaccounts.plannedpayment.PlannedPaymentActivity;
+import org.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.utils.DateUtils;
+import org.apache.fineract.utils.StatusUtils;
+import org.apache.fineract.utils.Utils;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsPresenter.java
similarity index 84%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsPresenter.java
index b9863c9..c4bfcab 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsPresenter.java
@@ -1,13 +1,13 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.loandetails;
+package org.apache.fineract.ui.online.loanaccounts.loandetails;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerLoans;
-import com.mifos.apache.fineract.data.models.loan.LoanAccount;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerLoans;
+import org.apache.fineract.data.models.loan.LoanAccount;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentActivity.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentActivity.java
similarity index 76%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentActivity.java
index 55d7b6a..6247f63 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentActivity.java
@@ -1,10 +1,10 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.plannedpayment;
+package org.apache.fineract.ui.online.loanaccounts.plannedpayment;
 
 import android.os.Bundle;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.R;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.utils.ConstantKeys;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentContract.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentContract.java
similarity index 83%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentContract.java
index bfde01a..7645e0e 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.plannedpayment;
+package org.apache.fineract.ui.online.loanaccounts.plannedpayment;
 
-import com.mifos.apache.fineract.data.models.payment.PlannedPayment;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.payment.PlannedPayment;
+import org.apache.fineract.ui.base.MvpView;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentFragment.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentFragment.java
similarity index 93%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentFragment.java
index f89c1bf..2ee5fdc 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.plannedpayment;
+package org.apache.fineract.ui.online.loanaccounts.plannedpayment;
 
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -15,15 +15,14 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.payment.PlannedPayment;
-import com.mifos.apache.fineract.ui.adapters.PlannedPaymentAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.ui.base.Toaster;
-import com.mifos.apache.fineract.utils.ConstantKeys;
-import com.mifos.apache.fineract.utils.DateUtils;
-
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.payment.PlannedPayment;
+import org.apache.fineract.ui.adapters.PlannedPaymentAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.ui.base.Toaster;
+import org.apache.fineract.utils.ConstantKeys;
+import org.apache.fineract.utils.DateUtils;
 import org.zakariya.stickyheaders.PagedLoadScrollListener;
 import org.zakariya.stickyheaders.StickyHeaderLayoutManager;
 

app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentPresenter.java
similarity index 88%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentPresenter.java
index 29be4b9..85357da 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentPresenter.java
@@ -1,14 +1,14 @@
-package com.mifos.apache.fineract.ui.online.loanaccounts.plannedpayment;
+package org.apache.fineract.ui.online.loanaccounts.plannedpayment;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerIndividualLending;
-import com.mifos.apache.fineract.data.models.payment.PlannedPayment;
-import com.mifos.apache.fineract.data.models.payment.PlannedPaymentPage;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerIndividualLending;
+import org.apache.fineract.data.models.payment.PlannedPayment;
+import org.apache.fineract.data.models.payment.PlannedPaymentPage;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/login/LoginActivity.java b/app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java
similarity index 89%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/login/LoginActivity.java
rename to app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java
index 96d96cf..7e46700 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/login/LoginActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.login;
+package org.apache.fineract.ui.online.login;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -6,11 +6,11 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
-import com.mifos.apache.fineract.data.models.Authentication;
-import com.mifos.apache.fineract.ui.online.DashboardActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.R;
+import org.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.data.models.Authentication;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.online.DashboardActivity;
 
 import javax.inject.Inject;
 

app/src/main/java/org/apache/fineract/ui/online/login/LoginContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/login/LoginContract.java b/app/src/main/java/org/apache/fineract/ui/online/login/LoginContract.java
similarity index 71%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/login/LoginContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/login/LoginContract.java
index eb04f69..5e599e2 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/login/LoginContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/login/LoginContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.login;
+package org.apache.fineract.ui.online.login;
 
-import com.mifos.apache.fineract.data.models.Authentication;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.Authentication;
+import org.apache.fineract.ui.base.MvpView;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/online/login/LoginPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/login/LoginPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/login/LoginPresenter.java
similarity index 87%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/login/LoginPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/login/LoginPresenter.java
index 098f2c3..e412876 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/login/LoginPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/login/LoginPresenter.java
@@ -1,17 +1,17 @@
-package com.mifos.apache.fineract.ui.online.login;
+package org.apache.fineract.ui.online.login;
 
-import static com.mifos.apache.fineract.data.remote.BaseApiManager.retrofit;
+import static org.apache.fineract.data.remote.BaseApiManager.retrofit;
 
 import android.content.Context;
 import android.util.Log;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerAuth;
-import com.mifos.apache.fineract.data.models.Authentication;
-import com.mifos.apache.fineract.data.models.error.MifosError;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerAuth;
+import org.apache.fineract.data.models.Authentication;
+import org.apache.fineract.data.models.error.MifosError;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;

app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesContract.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/roles/roleslist/RolesContract.java b/app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesContract.java
similarity index 72%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/roles/roleslist/RolesContract.java
rename to app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesContract.java
index b93cc7d..3ad142f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/roles/roleslist/RolesContract.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesContract.java
@@ -1,7 +1,7 @@
-package com.mifos.apache.fineract.ui.online.roles.roleslist;
+package org.apache.fineract.ui.online.roles.roleslist;
 
-import com.mifos.apache.fineract.data.models.rolesandpermission.Role;
-import com.mifos.apache.fineract.ui.base.MvpView;
+import org.apache.fineract.data.models.rolesandpermission.Role;
+import org.apache.fineract.ui.base.MvpView;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesFragment.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/roles/roleslist/RolesFragment.java b/app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesFragment.java
similarity index 91%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/roles/roleslist/RolesFragment.java
rename to app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesFragment.java
index 36e24ea..6fc3bc6 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/roles/roleslist/RolesFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesFragment.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.online.roles.roleslist;
+package org.apache.fineract.ui.online.roles.roleslist;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -13,12 +13,12 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.rolesandpermission.Role;
-import com.mifos.apache.fineract.ui.adapters.RolesAdapter;
-import com.mifos.apache.fineract.ui.base.MifosBaseActivity;
-import com.mifos.apache.fineract.ui.base.MifosBaseFragment;
-import com.mifos.apache.fineract.ui.base.OnItemClickListener;
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.rolesandpermission.Role;
+import org.apache.fineract.ui.adapters.RolesAdapter;
+import org.apache.fineract.ui.base.MifosBaseActivity;
+import org.apache.fineract.ui.base.MifosBaseFragment;
+import org.apache.fineract.ui.base.OnItemClickListener;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesPresenter.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/online/roles/roleslist/RolesPresenter.java b/app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesPresenter.java
similarity index 82%
rename from app/src/main/java/com/mifos/apache/fineract/ui/online/roles/roleslist/RolesPresenter.java
rename to app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesPresenter.java
index 278c259..b24d86a 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/online/roles/roleslist/RolesPresenter.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesPresenter.java
@@ -1,13 +1,13 @@
-package com.mifos.apache.fineract.ui.online.roles.roleslist;
+package org.apache.fineract.ui.online.roles.roleslist;
 
 import android.content.Context;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.datamanager.DataManagerRoles;
-import com.mifos.apache.fineract.data.models.rolesandpermission.Role;
-import com.mifos.apache.fineract.injection.ApplicationContext;
-import com.mifos.apache.fineract.injection.ConfigPersistent;
-import com.mifos.apache.fineract.ui.base.BasePresenter;
+import org.apache.fineract.R;
+import org.apache.fineract.data.datamanager.DataManagerRoles;
+import org.apache.fineract.data.models.rolesandpermission.Role;
+import org.apache.fineract.injection.ApplicationContext;
+import org.apache.fineract.injection.ConfigPersistent;
+import org.apache.fineract.ui.base.BasePresenter;
 
 import java.util.List;
 

app/src/main/java/org/apache/fineract/ui/refreshcallback/RefreshProfileImage.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/refreshcallback/RefreshProfileImage.java b/app/src/main/java/org/apache/fineract/ui/refreshcallback/RefreshProfileImage.java
similarity index 69%
rename from app/src/main/java/com/mifos/apache/fineract/ui/refreshcallback/RefreshProfileImage.java
rename to app/src/main/java/org/apache/fineract/ui/refreshcallback/RefreshProfileImage.java
index d482a1c..5a88463 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/refreshcallback/RefreshProfileImage.java
+++ b/app/src/main/java/org/apache/fineract/ui/refreshcallback/RefreshProfileImage.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.refreshcallback;
+package org.apache.fineract.ui.refreshcallback;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/uierrorhandler/MifosUIErrorHandler.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/uierrorhandler/MifosUIErrorHandler.java b/app/src/main/java/org/apache/fineract/ui/uierrorhandler/MifosUIErrorHandler.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/ui/uierrorhandler/MifosUIErrorHandler.java
rename to app/src/main/java/org/apache/fineract/ui/uierrorhandler/MifosUIErrorHandler.java
index 37fcbc1..4d6a144 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/uierrorhandler/MifosUIErrorHandler.java
+++ b/app/src/main/java/org/apache/fineract/ui/uierrorhandler/MifosUIErrorHandler.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.uierrorhandler;
+package org.apache.fineract.ui.uierrorhandler;
 
 import android.content.Context;
 import android.support.annotation.Nullable;
@@ -7,7 +7,7 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
+import org.apache.fineract.R;
 
 import butterknife.ButterKnife;
 

app/src/main/java/org/apache/fineract/ui/uierrorhandler/UIType.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/uierrorhandler/UIType.java b/app/src/main/java/org/apache/fineract/ui/uierrorhandler/UIType.java
similarity index 67%
rename from app/src/main/java/com/mifos/apache/fineract/ui/uierrorhandler/UIType.java
rename to app/src/main/java/org/apache/fineract/ui/uierrorhandler/UIType.java
index 9ee92ff..1c56892 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/uierrorhandler/UIType.java
+++ b/app/src/main/java/org/apache/fineract/ui/uierrorhandler/UIType.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.uierrorhandler;
+package org.apache.fineract.ui.uierrorhandler;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/ui/views/CircularImageView.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/views/CircularImageView.java b/app/src/main/java/org/apache/fineract/ui/views/CircularImageView.java
similarity index 98%
rename from app/src/main/java/com/mifos/apache/fineract/ui/views/CircularImageView.java
rename to app/src/main/java/org/apache/fineract/ui/views/CircularImageView.java
index 89aac23..ec878d2 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/views/CircularImageView.java
+++ b/app/src/main/java/org/apache/fineract/ui/views/CircularImageView.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.views;
+package org.apache.fineract.ui.views;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -13,7 +13,7 @@
 import android.util.AttributeSet;
 import android.widget.ImageView;
 
-import com.mifos.apache.fineract.R;
+import org.apache.fineract.R;
 
 public class CircularImageView extends ImageView {
     private int borderWidth;

app/src/main/java/org/apache/fineract/ui/views/DelayAutoCompleteTextView.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/views/DelayAutoCompleteTextView.java b/app/src/main/java/org/apache/fineract/ui/views/DelayAutoCompleteTextView.java
similarity index 97%
rename from app/src/main/java/com/mifos/apache/fineract/ui/views/DelayAutoCompleteTextView.java
rename to app/src/main/java/org/apache/fineract/ui/views/DelayAutoCompleteTextView.java
index ca05959..f97ae9d 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/views/DelayAutoCompleteTextView.java
+++ b/app/src/main/java/org/apache/fineract/ui/views/DelayAutoCompleteTextView.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.views;
+package org.apache.fineract.ui.views;
 
 import android.content.Context;
 import android.os.Handler;

app/src/main/java/org/apache/fineract/ui/views/HeaderView.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/views/HeaderView.java b/app/src/main/java/org/apache/fineract/ui/views/HeaderView.java
similarity index 94%
rename from app/src/main/java/com/mifos/apache/fineract/ui/views/HeaderView.java
rename to app/src/main/java/org/apache/fineract/ui/views/HeaderView.java
index 4d4ce74..fe23205 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/views/HeaderView.java
+++ b/app/src/main/java/org/apache/fineract/ui/views/HeaderView.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.views;
+package org.apache.fineract.ui.views;
 
 
 import android.annotation.TargetApi;
@@ -8,7 +8,7 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.mifos.apache.fineract.R;
+import org.apache.fineract.R;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;

app/src/main/java/org/apache/fineract/ui/views/TextDrawable.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/views/TextDrawable.java b/app/src/main/java/org/apache/fineract/ui/views/TextDrawable.java
similarity index 99%
rename from app/src/main/java/com/mifos/apache/fineract/ui/views/TextDrawable.java
rename to app/src/main/java/org/apache/fineract/ui/views/TextDrawable.java
index d4e65cb..ef35486 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/views/TextDrawable.java
+++ b/app/src/main/java/org/apache/fineract/ui/views/TextDrawable.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.views;
+package org.apache.fineract.ui.views;
 
 import android.graphics.Canvas;
 import android.graphics.Color;

app/src/main/java/org/apache/fineract/ui/views/ViewBehavior.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/ui/views/ViewBehavior.java b/app/src/main/java/org/apache/fineract/ui/views/ViewBehavior.java
similarity index 97%
rename from app/src/main/java/com/mifos/apache/fineract/ui/views/ViewBehavior.java
rename to app/src/main/java/org/apache/fineract/ui/views/ViewBehavior.java
index 5aa14bf..e3e2b00 100644
--- a/app/src/main/java/com/mifos/apache/fineract/ui/views/ViewBehavior.java
+++ b/app/src/main/java/org/apache/fineract/ui/views/ViewBehavior.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.ui.views;
+package org.apache.fineract.ui.views;
 
 
 import android.content.Context;
@@ -9,7 +9,8 @@
 import android.util.TypedValue;
 import android.view.View;
 
-import com.mifos.apache.fineract.R;
+import org.apache.fineract.R;
+
 
 public class ViewBehavior extends CoordinatorLayout.Behavior<HeaderView> {
 

app/src/main/java/org/apache/fineract/utils/AndroidVersionUtil.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/AndroidVersionUtil.java b/app/src/main/java/org/apache/fineract/utils/AndroidVersionUtil.java
similarity index 86%
rename from app/src/main/java/com/mifos/apache/fineract/utils/AndroidVersionUtil.java
rename to app/src/main/java/org/apache/fineract/utils/AndroidVersionUtil.java
index e7e3535..0ea72b6 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/AndroidVersionUtil.java
+++ b/app/src/main/java/org/apache/fineract/utils/AndroidVersionUtil.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
 public class AndroidVersionUtil {
 

app/src/main/java/org/apache/fineract/utils/AnimationUtils.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/AnimationUtils.java b/app/src/main/java/org/apache/fineract/utils/AnimationUtils.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/utils/AnimationUtils.java
rename to app/src/main/java/org/apache/fineract/utils/AnimationUtils.java
index ffb879f..a63498a 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/AnimationUtils.java
+++ b/app/src/main/java/org/apache/fineract/utils/AnimationUtils.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;

app/src/main/java/org/apache/fineract/utils/CheckSelfPermissionAndRequest.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/CheckSelfPermissionAndRequest.java b/app/src/main/java/org/apache/fineract/utils/CheckSelfPermissionAndRequest.java
similarity index 98%
rename from app/src/main/java/com/mifos/apache/fineract/utils/CheckSelfPermissionAndRequest.java
rename to app/src/main/java/org/apache/fineract/utils/CheckSelfPermissionAndRequest.java
index a7195a6..8e3ac13 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/CheckSelfPermissionAndRequest.java
+++ b/app/src/main/java/org/apache/fineract/utils/CheckSelfPermissionAndRequest.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -13,8 +13,8 @@
 import android.support.v7.app.AppCompatActivity;
 import android.widget.Toast;
 
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.R;
+import org.apache.fineract.data.local.PreferencesHelper;
 
 /**
  * This Class is the CheckSelfPermissionAndRequest Class

app/src/main/java/org/apache/fineract/utils/ColorGenerator.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/ColorGenerator.java b/app/src/main/java/org/apache/fineract/utils/ColorGenerator.java
similarity index 97%
rename from app/src/main/java/com/mifos/apache/fineract/utils/ColorGenerator.java
rename to app/src/main/java/org/apache/fineract/utils/ColorGenerator.java
index eb59645..ea3e496 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/ColorGenerator.java
+++ b/app/src/main/java/org/apache/fineract/utils/ColorGenerator.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
 import java.util.Arrays;
 import java.util.List;

app/src/main/java/org/apache/fineract/utils/ConstantKeys.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/ConstantKeys.java b/app/src/main/java/org/apache/fineract/utils/ConstantKeys.java
similarity index 97%
rename from app/src/main/java/com/mifos/apache/fineract/utils/ConstantKeys.java
rename to app/src/main/java/org/apache/fineract/utils/ConstantKeys.java
index c45ecba..2258a7e 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/ConstantKeys.java
+++ b/app/src/main/java/org/apache/fineract/utils/ConstantKeys.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
 /**
  * @author Rajan Maurya

app/src/main/java/org/apache/fineract/utils/DateUtils.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/DateUtils.java b/app/src/main/java/org/apache/fineract/utils/DateUtils.java
similarity index 98%
rename from app/src/main/java/com/mifos/apache/fineract/utils/DateUtils.java
rename to app/src/main/java/org/apache/fineract/utils/DateUtils.java
index cc6903a..172bfef 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/DateUtils.java
+++ b/app/src/main/java/org/apache/fineract/utils/DateUtils.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
 import android.util.Log;
 

app/src/main/java/org/apache/fineract/utils/FileUtils.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/FileUtils.java b/app/src/main/java/org/apache/fineract/utils/FileUtils.java
similarity index 99%
rename from app/src/main/java/com/mifos/apache/fineract/utils/FileUtils.java
rename to app/src/main/java/org/apache/fineract/utils/FileUtils.java
index 0aa0393..aac4fc4 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/FileUtils.java
+++ b/app/src/main/java/org/apache/fineract/utils/FileUtils.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
 import android.annotation.TargetApi;
 import android.content.ContentUris;

app/src/main/java/org/apache/fineract/utils/ImageLoaderUtils.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/ImageLoaderUtils.java b/app/src/main/java/org/apache/fineract/utils/ImageLoaderUtils.java
similarity index 90%
rename from app/src/main/java/com/mifos/apache/fineract/utils/ImageLoaderUtils.java
rename to app/src/main/java/org/apache/fineract/utils/ImageLoaderUtils.java
index 9cfe773..66f076f 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/ImageLoaderUtils.java
+++ b/app/src/main/java/org/apache/fineract/utils/ImageLoaderUtils.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -10,10 +10,10 @@
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.load.model.LazyHeaders;
 import com.bumptech.glide.request.target.BitmapImageViewTarget;
-import com.mifos.apache.fineract.data.local.PreferencesHelper;
-import com.mifos.apache.fineract.data.remote.BaseUrl;
-import com.mifos.apache.fineract.data.remote.EndPoints;
-import com.mifos.apache.fineract.data.remote.MifosInterceptor;
+import org.apache.fineract.data.local.PreferencesHelper;
+import org.apache.fineract.data.remote.BaseUrl;
+import org.apache.fineract.data.remote.EndPoints;
+import org.apache.fineract.data.remote.MifosInterceptor;
 
 
 /**

app/src/main/java/org/apache/fineract/utils/MaterialDialog.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/MaterialDialog.java b/app/src/main/java/org/apache/fineract/utils/MaterialDialog.java
similarity index 96%
rename from app/src/main/java/com/mifos/apache/fineract/utils/MaterialDialog.java
rename to app/src/main/java/org/apache/fineract/utils/MaterialDialog.java
index fb160e9..54dbbdd 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/MaterialDialog.java
+++ b/app/src/main/java/org/apache/fineract/utils/MaterialDialog.java
@@ -1,17 +1,17 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
 import android.content.Context;
 import android.content.DialogInterface;
 import android.support.annotation.StringRes;
 import android.support.v7.app.AlertDialog;
 
-import com.mifos.apache.fineract.R;
+import org.apache.fineract.R;
 
 /**
  * This Class is the Material Dialog Builder Class
  * Created by Rajan Maurya on 03/08/16.
  */
-public final class MaterialDialog  {
+public final class MaterialDialog {
 
     public static class Builder {
 
@@ -61,7 +61,7 @@
         }
 
         //This Method Set the String Resources Text To Positive Button
-        public Builder setPositiveButton(@StringRes int  positiveText) {
+        public Builder setPositiveButton(@StringRes int positiveText) {
             materialDialogBuilder.setPositiveButton(positiveText, null);
             return this;
         }

app/src/main/java/org/apache/fineract/utils/MifosErrorUtils.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/MifosErrorUtils.java b/app/src/main/java/org/apache/fineract/utils/MifosErrorUtils.java
similarity index 93%
rename from app/src/main/java/com/mifos/apache/fineract/utils/MifosErrorUtils.java
rename to app/src/main/java/org/apache/fineract/utils/MifosErrorUtils.java
index 089b381..f7343f6 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/MifosErrorUtils.java
+++ b/app/src/main/java/org/apache/fineract/utils/MifosErrorUtils.java
@@ -1,12 +1,12 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
-import static com.mifos.apache.fineract.data.remote.BaseApiManager.retrofit;
+import static org.apache.fineract.data.remote.BaseApiManager.retrofit;
 
 import android.content.Context;
 import android.util.Log;
 
 import com.google.gson.Gson;
-import com.mifos.apache.fineract.data.models.error.MifosError;
+import org.apache.fineract.data.models.error.MifosError;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;

app/src/main/java/org/apache/fineract/utils/ProgressBarHandler.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/ProgressBarHandler.java b/app/src/main/java/org/apache/fineract/utils/ProgressBarHandler.java
similarity index 96%
rename from app/src/main/java/com/mifos/apache/fineract/utils/ProgressBarHandler.java
rename to app/src/main/java/org/apache/fineract/utils/ProgressBarHandler.java
index 01b62ec..ccbcb41 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/ProgressBarHandler.java
+++ b/app/src/main/java/org/apache/fineract/utils/ProgressBarHandler.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
 import android.R.attr;
 import android.R.id;

app/src/main/java/org/apache/fineract/utils/ScrollFabBehavior.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/ScrollFabBehavior.java b/app/src/main/java/org/apache/fineract/utils/ScrollFabBehavior.java
similarity index 97%
rename from app/src/main/java/com/mifos/apache/fineract/utils/ScrollFabBehavior.java
rename to app/src/main/java/org/apache/fineract/utils/ScrollFabBehavior.java
index 82ad339..4186dba 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/ScrollFabBehavior.java
+++ b/app/src/main/java/org/apache/fineract/utils/ScrollFabBehavior.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
 import android.content.Context;
 import android.support.design.widget.CoordinatorLayout;

app/src/main/java/org/apache/fineract/utils/StatusUtils.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/StatusUtils.java b/app/src/main/java/org/apache/fineract/utils/StatusUtils.java
similarity index 94%
rename from app/src/main/java/com/mifos/apache/fineract/utils/StatusUtils.java
rename to app/src/main/java/org/apache/fineract/utils/StatusUtils.java
index 698f6ef..8ede644 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/StatusUtils.java
+++ b/app/src/main/java/org/apache/fineract/utils/StatusUtils.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
 import android.content.Context;
 import android.support.v4.content.ContextCompat;
@@ -6,11 +6,12 @@
 import android.widget.ImageView;
 
 import com.google.gson.annotations.SerializedName;
-import com.mifos.apache.fineract.R;
-import com.mifos.apache.fineract.data.models.customer.Command;
-import com.mifos.apache.fineract.data.models.customer.Customer;
-import com.mifos.apache.fineract.data.models.deposit.DepositAccount;
-import com.mifos.apache.fineract.data.models.loan.LoanAccount;
+
+import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.Command;
+import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.data.models.loan.LoanAccount;
 
 /**
  * @author Rajan Maurya
@@ -18,7 +19,7 @@
  */
 public class StatusUtils {
 
-    public static void setCustomerStatus (Customer.State state, AppCompatImageView imageView,
+    public static void setCustomerStatus(Customer.State state, AppCompatImageView imageView,
             Context context) {
         switch (state) {
             case ACTIVE:
@@ -70,7 +71,7 @@
         }
     }
 
-    public static void setLoanAccountStatus (LoanAccount.State state, AppCompatImageView imageView,
+    public static void setLoanAccountStatus(LoanAccount.State state, AppCompatImageView imageView,
             Context context) {
         switch (state) {
             case CREATED:

app/src/main/java/org/apache/fineract/utils/Utils.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/Utils.java b/app/src/main/java/org/apache/fineract/utils/Utils.java
similarity index 96%
rename from app/src/main/java/com/mifos/apache/fineract/utils/Utils.java
rename to app/src/main/java/org/apache/fineract/utils/Utils.java
index d3f7139..d9af4bd 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/Utils.java
+++ b/app/src/main/java/org/apache/fineract/utils/Utils.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
 import android.content.Context;
 import android.graphics.PorterDuff;

app/src/main/java/org/apache/fineract/utils/ValidateIdentifierUtil.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/ValidateIdentifierUtil.java b/app/src/main/java/org/apache/fineract/utils/ValidateIdentifierUtil.java
similarity index 96%
rename from app/src/main/java/com/mifos/apache/fineract/utils/ValidateIdentifierUtil.java
rename to app/src/main/java/org/apache/fineract/utils/ValidateIdentifierUtil.java
index fda4902..df806d8 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/ValidateIdentifierUtil.java
+++ b/app/src/main/java/org/apache/fineract/utils/ValidateIdentifierUtil.java
@@ -1,10 +1,10 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
 import android.content.Context;
 import android.support.design.widget.TextInputLayout;
 import android.text.TextUtils;
 
-import com.mifos.apache.fineract.R;
+import org.apache.fineract.R;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;

app/src/main/java/org/apache/fineract/utils/ValidationUtil.java

diff --git a/app/src/main/java/com/mifos/apache/fineract/utils/ValidationUtil.java b/app/src/main/java/org/apache/fineract/utils/ValidationUtil.java
similarity index 95%
rename from app/src/main/java/com/mifos/apache/fineract/utils/ValidationUtil.java
rename to app/src/main/java/org/apache/fineract/utils/ValidationUtil.java
index 8f686e8..3d89309 100644
--- a/app/src/main/java/com/mifos/apache/fineract/utils/ValidationUtil.java
+++ b/app/src/main/java/org/apache/fineract/utils/ValidationUtil.java
@@ -1,10 +1,10 @@
-package com.mifos.apache.fineract.utils;
+package org.apache.fineract.utils;
 
 import android.content.Context;
 import android.support.design.widget.TextInputLayout;
 import android.text.TextUtils;
 
-import com.mifos.apache.fineract.R;
+import org.apache.fineract.R;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;

app/src/main/res/layout/fragment_customer_details.xml

diff --git a/app/src/main/res/layout/fragment_customer_details.xml b/app/src/main/res/layout/fragment_customer_details.xml
index 15848ec..8797432 100644
--- a/app/src/main/res/layout/fragment_customer_details.xml
+++ b/app/src/main/res/layout/fragment_customer_details.xml
@@ -649,7 +649,7 @@
         android:id="@+id/float_header_view"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        app:layout_behavior="com.mifos.apache.fineract.ui.views.ViewBehavior"
+        app:layout_behavior="org.apache.fineract.ui.views.ViewBehavior"
     />
 
     <android.support.design.widget.FloatingActionButton

app/src/main/res/layout/fragment_form_deposit_assign_product.xml

diff --git a/app/src/main/res/layout/fragment_form_deposit_assign_product.xml b/app/src/main/res/layout/fragment_form_deposit_assign_product.xml
index 31605f7..1eebcb8 100644
--- a/app/src/main/res/layout/fragment_form_deposit_assign_product.xml
+++ b/app/src/main/res/layout/fragment_form_deposit_assign_product.xml
@@ -65,7 +65,7 @@
                         android:layout_width="match_parent"
                         android:paddingBottom="@dimen/layout_padding_16dp">
 
-                        <com.mifos.apache.fineract.ui.views.DelayAutoCompleteTextView
+                        <org.apache.fineract.ui.views.DelayAutoCompleteTextView
                             android:hint="@string/search_beneficiary"
                             android:id="@+id/et_search_beneficiary"
                             android:inputType="textCapSentences"

app/src/main/res/layout/fragment_roles_list.xml

diff --git a/app/src/main/res/layout/fragment_roles_list.xml b/app/src/main/res/layout/fragment_roles_list.xml
index c422a41..fd10e39 100644
--- a/app/src/main/res/layout/fragment_roles_list.xml
+++ b/app/src/main/res/layout/fragment_roles_list.xml
@@ -30,7 +30,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/layout_padding_16dp"
         android:layout_width="wrap_content"
-        app:layout_behavior="com.mifos.apache.fineract.utils.ScrollFabBehavior"
+        app:layout_behavior="org.apache.fineract.utils.ScrollFabBehavior"
         app:srcCompat="@drawable/ic_add_black_24dp"/>
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file

app/src/main/res/layout/layout_collapsing_header_view.xml

diff --git a/app/src/main/res/layout/layout_collapsing_header_view.xml b/app/src/main/res/layout/layout_collapsing_header_view.xml
index 25dd40c..406d58d 100644
--- a/app/src/main/res/layout/layout_collapsing_header_view.xml
+++ b/app/src/main/res/layout/layout_collapsing_header_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mifos.apache.fineract.ui.views.HeaderView
+<org.apache.fineract.ui.views.HeaderView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -26,4 +26,4 @@
         />
 
 
-</com.mifos.apache.fineract.ui.views.HeaderView>
\ No newline at end of file
+</org.apache.fineract.ui.views.HeaderView>
\ No newline at end of file

app/src/test/java/org/apache/fineract/ExampleUnitTest.java

diff --git a/app/src/test/java/com/mifos/apache/fineract/ExampleUnitTest.java b/app/src/test/java/org/apache/fineract/ExampleUnitTest.java
similarity index 91%
rename from app/src/test/java/com/mifos/apache/fineract/ExampleUnitTest.java
rename to app/src/test/java/org/apache/fineract/ExampleUnitTest.java
index e8efcd2..9614de5 100644
--- a/app/src/test/java/com/mifos/apache/fineract/ExampleUnitTest.java
+++ b/app/src/test/java/org/apache/fineract/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.mifos.apache.fineract;
+package org.apache.fineract;
 
 import static junit.framework.Assert.assertEquals;
 

config/quality/findbugs/android-exclude-filter.xml

diff --git a/config/quality/findbugs/android-exclude-filter.xml b/config/quality/findbugs/android-exclude-filter.xml
index 4dc4166..99bfb6f 100644
--- a/config/quality/findbugs/android-exclude-filter.xml
+++ b/config/quality/findbugs/android-exclude-filter.xml
@@ -16,30 +16,30 @@
 
     <!--Ignore the static App.java instance initialization-->
     <Match>
-        <Class name="com.mifos.apache.fineract.MifosApplication"/>
+        <Class name="org.apache.fineract.MifosApplication"/>
         <Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD" />
     </Match>
 
     <!--Ignore MS_MUTABLE_COLLECTION in App.java-->
     <Match>
-        <Class name="com.mifos.apache.fineract.MifosApplication"/>
+        <Class name="org.apache.fineract.MifosApplication"/>
         <Bug pattern="MS_MUTABLE_COLLECTION" />
     </Match>
 
     <!--Ignore RV_ABSOLUTE_VALUE_OF_HASHCODE in ColorGenerator-->
     <Match>
-        <Class name="com.mifos.apache.fineract.utils.ColorGenerator"/>
+        <Class name="org.apache.fineract.utils.ColorGenerator"/>
         <Bug pattern="RV_ABSOLUTE_VALUE_OF_HASHCODE" />
     </Match>
 
     <!-- Ignore DM_DEFAULT_ENCODING in TestDataFactory-->
     <Match>
-        <Class name="com.mifos.apache.fineract.TestDataFactory" />
+        <Class name="org.apache.fineract.TestDataFactory" />
         <Method name="getObjectTypePojo" />
         <Bug pattern="DM_DEFAULT_ENCODING" />
     </Match>
     <Match>
-        <Class name="com.mifos.apache.fineract.TestDataFactory" />
+        <Class name="org.apache.fineract.TestDataFactory" />
         <Method name="getListTypePojo" />
         <Bug pattern="DM_DEFAULT_ENCODING" />
     </Match>