From 4b03a72fcff5664187c0ca5634d9b0804eb19611 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Wed, 5 Apr 2017 11:40:22 +0200
Subject: [PATCH] Reorganization of app sources and test sources

---
 build.gradle                                                | 6 ++----
 linphoneAndroidSdk.gradle                                   | 3 +--
 .../com/android/vending/billing/IInAppBillingService.aidl   | 0
 src/{ => android}/org/linphone/AboutFragment.java           | 0
 src/{ => android}/org/linphone/AccountEnableReceiver.java   | 0
 .../org/linphone/AccountPreferencesFragment.java            | 0
 src/{ => android}/org/linphone/BandwidthManager.java        | 0
 src/{ => android}/org/linphone/BluetoothManager.java        | 0
 src/{ => android}/org/linphone/BootReceiver.java            | 0
 src/{ => android}/org/linphone/CallActivity.java            | 0
 src/{ => android}/org/linphone/CallAudioFragment.java       | 0
 src/{ => android}/org/linphone/CallIncomingActivity.java    | 0
 src/{ => android}/org/linphone/CallManager.java             | 0
 src/{ => android}/org/linphone/CallOutgoingActivity.java    | 0
 src/{ => android}/org/linphone/CallVideoFragment.java       | 0
 src/{ => android}/org/linphone/ChatFragment.java            | 0
 src/{ => android}/org/linphone/ChatListFragment.java        | 0
 src/{ => android}/org/linphone/ContactDetailsFragment.java  | 0
 src/{ => android}/org/linphone/ContactEditorFragment.java   | 0
 src/{ => android}/org/linphone/ContactsListFragment.java    | 0
 src/{ => android}/org/linphone/ContactsManager.java         | 0
 src/{ => android}/org/linphone/DialerFragment.java          | 0
 src/{ => android}/org/linphone/DozeReceiver.java            | 0
 src/{ => android}/org/linphone/EmptyFragment.java           | 0
 src/{ => android}/org/linphone/FragmentsAvailable.java      | 0
 src/{ => android}/org/linphone/HistoryDetailFragment.java   | 0
 src/{ => android}/org/linphone/HistoryListFragment.java     | 0
 src/{ => android}/org/linphone/HookReceiver.java            | 0
 src/{ => android}/org/linphone/KeepAliveReceiver.java       | 0
 src/{ => android}/org/linphone/LinphoneActivity.java        | 0
 src/{ => android}/org/linphone/LinphoneContact.java         | 0
 src/{ => android}/org/linphone/LinphoneException.java       | 0
 src/{ => android}/org/linphone/LinphoneGenericActivity.java | 0
 .../org/linphone/LinphoneLauncherActivity.java              | 0
 src/{ => android}/org/linphone/LinphoneManager.java         | 0
 src/{ => android}/org/linphone/LinphoneNumberOrAddress.java | 0
 src/{ => android}/org/linphone/LinphonePreferences.java     | 0
 src/{ => android}/org/linphone/LinphoneService.java         | 0
 src/{ => android}/org/linphone/LinphoneUtils.java           | 0
 src/{ => android}/org/linphone/NetworkManager.java          | 0
 .../org/linphone/PhoneStateChangedReceiver.java             | 0
 src/{ => android}/org/linphone/PreferencesMigrator.java     | 0
 src/{ => android}/org/linphone/SettingsFragment.java        | 0
 src/{ => android}/org/linphone/StatusFragment.java          | 0
 src/{ => android}/org/linphone/UIThreadDispatcher.java      | 0
 .../org/linphone/assistant/AssistantActivity.java           | 0
 .../org/linphone/assistant/AssistantFragmentsEnum.java      | 0
 .../org/linphone/assistant/CodecDownloaderFragment.java     | 0
 .../org/linphone/assistant/CountryListFragment.java         | 0
 .../linphone/assistant/CreateAccountActivationFragment.java | 0
 .../assistant/CreateAccountCodeActivationFragment.java      | 0
 .../org/linphone/assistant/CreateAccountFragment.java       | 0
 .../assistant/EchoCancellerCalibrationFragment.java         | 0
 .../org/linphone/assistant/LinphoneLoginFragment.java       | 0
 src/{ => android}/org/linphone/assistant/LoginFragment.java | 0
 .../org/linphone/assistant/RemoteProvisioningActivity.java  | 0
 .../org/linphone/assistant/RemoteProvisioningFragment.java  | 0
 .../linphone/assistant/RemoteProvisioningLoginActivity.java | 0
 .../org/linphone/assistant/WelcomeFragment.java             | 0
 .../org/linphone/compatibility/ApiElevenPlus.java           | 0
 .../org/linphone/compatibility/ApiNineteenPlus.java         | 0
 .../org/linphone/compatibility/ApiSixteenPlus.java          | 0
 .../org/linphone/compatibility/ApiTwentyOnePlus.java        | 0
 .../org/linphone/compatibility/ApiTwentyThreePlus.java      | 0
 .../org/linphone/compatibility/Compatibility.java           | 0
 .../compatibility/CompatibilityScaleGestureDetector.java    | 0
 .../compatibility/CompatibilityScaleGestureListener.java    | 0
 .../org/linphone/firebase/FirebaseIdService.java            | 0
 .../org/linphone/firebase/FirebaseMessaging.java            | 0
 src/{ => android}/org/linphone/gcm/GCMReceiver.java         | 0
 src/{ => android}/org/linphone/gcm/GCMService.java          | 0
 .../org/linphone/purchase/InAppPurchaseActivity.java        | 0
 .../org/linphone/purchase/InAppPurchaseFragment.java        | 0
 .../org/linphone/purchase/InAppPurchaseHelper.java          | 0
 .../org/linphone/purchase/InAppPurchaseListFragment.java    | 0
 .../org/linphone/purchase/InAppPurchaseListener.java        | 0
 .../org/linphone/purchase/InAppPurchaseListenerBase.java    | 0
 src/{ => android}/org/linphone/purchase/Purchasable.java    | 0
 .../org/linphone/sync/AuthenticationService.java            | 0
 src/{ => android}/org/linphone/sync/Authenticator.java      | 0
 src/{ => android}/org/linphone/sync/SyncAdapter.java        | 0
 src/{ => android}/org/linphone/sync/SyncService.java        | 0
 .../org/linphone/tutorials/AndroidTutorialNotifier.java     | 0
 .../org/linphone/tutorials/TutorialBuddyStatusActivity.java | 0
 .../org/linphone/tutorials/TutorialCardDavSync.java         | 0
 .../org/linphone/tutorials/TutorialChatRoomActivity.java    | 0
 .../org/linphone/tutorials/TutorialHelloWorldActivity.java  | 0
 .../org/linphone/tutorials/TutorialLauncherActivity.java    | 0
 .../linphone/tutorials/TutorialRegistrationActivity.java    | 0
 src/{ => android}/org/linphone/ui/AddressAware.java         | 0
 src/{ => android}/org/linphone/ui/AddressText.java          | 0
 src/{ => android}/org/linphone/ui/CallButton.java           | 0
 src/{ => android}/org/linphone/ui/Digit.java                | 0
 src/{ => android}/org/linphone/ui/EraseButton.java          | 0
 src/{ => android}/org/linphone/ui/LedPreference.java        | 0
 src/{ => android}/org/linphone/ui/LinphoneOverlay.java      | 0
 src/{ => android}/org/linphone/ui/LinphoneScrollView.java   | 0
 src/{ => android}/org/linphone/ui/LinphoneSliders.java      | 0
 src/{ => android}/org/linphone/ui/Numpad.java               | 0
 .../org/linphone/ui/PreferencesListFragment.java            | 0
 src/{ => android}/org/linphone/ui/ScrollViewListener.java   | 0
 src/{ => android}/org/linphone/ui/SlidingDrawer.java        | 0
 src/{ => android}/org/linphone/xmlrpc/XmlRpcHelper.java     | 0
 src/{ => android}/org/linphone/xmlrpc/XmlRpcListener.java   | 0
 .../org/linphone/xmlrpc/XmlRpcListenerBase.java             | 0
 .../{java => org/linphone/ui/tester}/AccountAssistant.java  | 2 ++
 .../{java => org/linphone/ui/tester}/AccountManagement.java | 2 ++
 .../{java => org/linphone/ui/tester}/AinitTestEnv.java      | 2 ++
 .../{java => org/linphone/ui/tester}/CallsAudio.java        | 2 ++
 .../{java => org/linphone/ui/tester}/CallsVideo.java        | 2 ++
 src/androidTest/{java => org/linphone/ui/tester}/Chat.java  | 2 ++
 .../linphone/ui/tester}/ConferenceAndMultiCall.java         | 2 ++
 .../{java => org/linphone/ui/tester}/Contacts.java          | 2 ++
 .../{java => org/linphone/ui/tester}/History.java           | 2 ++
 .../linphone/ui/tester}/LinphoneTestManager.java            | 2 ++
 .../{java => org/linphone/ui/tester}/SampleTest.java        | 2 ++
 .../{java => org/linphone/ui/tester}/Transfer.java          | 2 ++
 .../{java => org/linphone/ui/tester}/ZShutdownTestEnv.java  | 2 ++
 118 files changed, 29 insertions(+), 6 deletions(-)
 rename src/{ => android}/com/android/vending/billing/IInAppBillingService.aidl (100%)
 rename src/{ => android}/org/linphone/AboutFragment.java (100%)
 rename src/{ => android}/org/linphone/AccountEnableReceiver.java (100%)
 rename src/{ => android}/org/linphone/AccountPreferencesFragment.java (100%)
 rename src/{ => android}/org/linphone/BandwidthManager.java (100%)
 rename src/{ => android}/org/linphone/BluetoothManager.java (100%)
 rename src/{ => android}/org/linphone/BootReceiver.java (100%)
 rename src/{ => android}/org/linphone/CallActivity.java (100%)
 rename src/{ => android}/org/linphone/CallAudioFragment.java (100%)
 rename src/{ => android}/org/linphone/CallIncomingActivity.java (100%)
 rename src/{ => android}/org/linphone/CallManager.java (100%)
 rename src/{ => android}/org/linphone/CallOutgoingActivity.java (100%)
 rename src/{ => android}/org/linphone/CallVideoFragment.java (100%)
 rename src/{ => android}/org/linphone/ChatFragment.java (100%)
 rename src/{ => android}/org/linphone/ChatListFragment.java (100%)
 rename src/{ => android}/org/linphone/ContactDetailsFragment.java (100%)
 rename src/{ => android}/org/linphone/ContactEditorFragment.java (100%)
 rename src/{ => android}/org/linphone/ContactsListFragment.java (100%)
 rename src/{ => android}/org/linphone/ContactsManager.java (100%)
 rename src/{ => android}/org/linphone/DialerFragment.java (100%)
 rename src/{ => android}/org/linphone/DozeReceiver.java (100%)
 rename src/{ => android}/org/linphone/EmptyFragment.java (100%)
 rename src/{ => android}/org/linphone/FragmentsAvailable.java (100%)
 rename src/{ => android}/org/linphone/HistoryDetailFragment.java (100%)
 rename src/{ => android}/org/linphone/HistoryListFragment.java (100%)
 rename src/{ => android}/org/linphone/HookReceiver.java (100%)
 rename src/{ => android}/org/linphone/KeepAliveReceiver.java (100%)
 rename src/{ => android}/org/linphone/LinphoneActivity.java (100%)
 rename src/{ => android}/org/linphone/LinphoneContact.java (100%)
 rename src/{ => android}/org/linphone/LinphoneException.java (100%)
 rename src/{ => android}/org/linphone/LinphoneGenericActivity.java (100%)
 rename src/{ => android}/org/linphone/LinphoneLauncherActivity.java (100%)
 rename src/{ => android}/org/linphone/LinphoneManager.java (100%)
 rename src/{ => android}/org/linphone/LinphoneNumberOrAddress.java (100%)
 rename src/{ => android}/org/linphone/LinphonePreferences.java (100%)
 rename src/{ => android}/org/linphone/LinphoneService.java (100%)
 rename src/{ => android}/org/linphone/LinphoneUtils.java (100%)
 rename src/{ => android}/org/linphone/NetworkManager.java (100%)
 rename src/{ => android}/org/linphone/PhoneStateChangedReceiver.java (100%)
 rename src/{ => android}/org/linphone/PreferencesMigrator.java (100%)
 rename src/{ => android}/org/linphone/SettingsFragment.java (100%)
 rename src/{ => android}/org/linphone/StatusFragment.java (100%)
 rename src/{ => android}/org/linphone/UIThreadDispatcher.java (100%)
 rename src/{ => android}/org/linphone/assistant/AssistantActivity.java (100%)
 rename src/{ => android}/org/linphone/assistant/AssistantFragmentsEnum.java (100%)
 rename src/{ => android}/org/linphone/assistant/CodecDownloaderFragment.java (100%)
 rename src/{ => android}/org/linphone/assistant/CountryListFragment.java (100%)
 rename src/{ => android}/org/linphone/assistant/CreateAccountActivationFragment.java (100%)
 rename src/{ => android}/org/linphone/assistant/CreateAccountCodeActivationFragment.java (100%)
 rename src/{ => android}/org/linphone/assistant/CreateAccountFragment.java (100%)
 rename src/{ => android}/org/linphone/assistant/EchoCancellerCalibrationFragment.java (100%)
 rename src/{ => android}/org/linphone/assistant/LinphoneLoginFragment.java (100%)
 rename src/{ => android}/org/linphone/assistant/LoginFragment.java (100%)
 rename src/{ => android}/org/linphone/assistant/RemoteProvisioningActivity.java (100%)
 rename src/{ => android}/org/linphone/assistant/RemoteProvisioningFragment.java (100%)
 rename src/{ => android}/org/linphone/assistant/RemoteProvisioningLoginActivity.java (100%)
 rename src/{ => android}/org/linphone/assistant/WelcomeFragment.java (100%)
 rename src/{ => android}/org/linphone/compatibility/ApiElevenPlus.java (100%)
 rename src/{ => android}/org/linphone/compatibility/ApiNineteenPlus.java (100%)
 rename src/{ => android}/org/linphone/compatibility/ApiSixteenPlus.java (100%)
 rename src/{ => android}/org/linphone/compatibility/ApiTwentyOnePlus.java (100%)
 rename src/{ => android}/org/linphone/compatibility/ApiTwentyThreePlus.java (100%)
 rename src/{ => android}/org/linphone/compatibility/Compatibility.java (100%)
 rename src/{ => android}/org/linphone/compatibility/CompatibilityScaleGestureDetector.java (100%)
 rename src/{ => android}/org/linphone/compatibility/CompatibilityScaleGestureListener.java (100%)
 rename src/{ => android}/org/linphone/firebase/FirebaseIdService.java (100%)
 rename src/{ => android}/org/linphone/firebase/FirebaseMessaging.java (100%)
 rename src/{ => android}/org/linphone/gcm/GCMReceiver.java (100%)
 rename src/{ => android}/org/linphone/gcm/GCMService.java (100%)
 rename src/{ => android}/org/linphone/purchase/InAppPurchaseActivity.java (100%)
 rename src/{ => android}/org/linphone/purchase/InAppPurchaseFragment.java (100%)
 rename src/{ => android}/org/linphone/purchase/InAppPurchaseHelper.java (100%)
 rename src/{ => android}/org/linphone/purchase/InAppPurchaseListFragment.java (100%)
 rename src/{ => android}/org/linphone/purchase/InAppPurchaseListener.java (100%)
 rename src/{ => android}/org/linphone/purchase/InAppPurchaseListenerBase.java (100%)
 rename src/{ => android}/org/linphone/purchase/Purchasable.java (100%)
 rename src/{ => android}/org/linphone/sync/AuthenticationService.java (100%)
 rename src/{ => android}/org/linphone/sync/Authenticator.java (100%)
 rename src/{ => android}/org/linphone/sync/SyncAdapter.java (100%)
 rename src/{ => android}/org/linphone/sync/SyncService.java (100%)
 rename src/{ => android}/org/linphone/tutorials/AndroidTutorialNotifier.java (100%)
 rename src/{ => android}/org/linphone/tutorials/TutorialBuddyStatusActivity.java (100%)
 rename src/{ => android}/org/linphone/tutorials/TutorialCardDavSync.java (100%)
 rename src/{ => android}/org/linphone/tutorials/TutorialChatRoomActivity.java (100%)
 rename src/{ => android}/org/linphone/tutorials/TutorialHelloWorldActivity.java (100%)
 rename src/{ => android}/org/linphone/tutorials/TutorialLauncherActivity.java (100%)
 rename src/{ => android}/org/linphone/tutorials/TutorialRegistrationActivity.java (100%)
 rename src/{ => android}/org/linphone/ui/AddressAware.java (100%)
 rename src/{ => android}/org/linphone/ui/AddressText.java (100%)
 rename src/{ => android}/org/linphone/ui/CallButton.java (100%)
 rename src/{ => android}/org/linphone/ui/Digit.java (100%)
 rename src/{ => android}/org/linphone/ui/EraseButton.java (100%)
 rename src/{ => android}/org/linphone/ui/LedPreference.java (100%)
 rename src/{ => android}/org/linphone/ui/LinphoneOverlay.java (100%)
 rename src/{ => android}/org/linphone/ui/LinphoneScrollView.java (100%)
 rename src/{ => android}/org/linphone/ui/LinphoneSliders.java (100%)
 rename src/{ => android}/org/linphone/ui/Numpad.java (100%)
 rename src/{ => android}/org/linphone/ui/PreferencesListFragment.java (100%)
 rename src/{ => android}/org/linphone/ui/ScrollViewListener.java (100%)
 rename src/{ => android}/org/linphone/ui/SlidingDrawer.java (100%)
 rename src/{ => android}/org/linphone/xmlrpc/XmlRpcHelper.java (100%)
 rename src/{ => android}/org/linphone/xmlrpc/XmlRpcListener.java (100%)
 rename src/{ => android}/org/linphone/xmlrpc/XmlRpcListenerBase.java (100%)
 rename src/androidTest/{java => org/linphone/ui/tester}/AccountAssistant.java (99%)
 rename src/androidTest/{java => org/linphone/ui/tester}/AccountManagement.java (98%)
 rename src/androidTest/{java => org/linphone/ui/tester}/AinitTestEnv.java (94%)
 rename src/androidTest/{java => org/linphone/ui/tester}/CallsAudio.java (99%)
 rename src/androidTest/{java => org/linphone/ui/tester}/CallsVideo.java (99%)
 rename src/androidTest/{java => org/linphone/ui/tester}/Chat.java (99%)
 rename src/androidTest/{java => org/linphone/ui/tester}/ConferenceAndMultiCall.java (99%)
 rename src/androidTest/{java => org/linphone/ui/tester}/Contacts.java (99%)
 rename src/androidTest/{java => org/linphone/ui/tester}/History.java (98%)
 rename src/androidTest/{java => org/linphone/ui/tester}/LinphoneTestManager.java (99%)
 rename src/androidTest/{java => org/linphone/ui/tester}/SampleTest.java (98%)
 rename src/androidTest/{java => org/linphone/ui/tester}/Transfer.java (98%)
 rename src/androidTest/{java => org/linphone/ui/tester}/ZShutdownTestEnv.java (94%)

diff --git a/build.gradle b/build.gradle
index 47befc141..9c8ed600f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -96,8 +96,7 @@ android {
     main {
       manifest.srcFile 'AndroidManifest.xml'
       def srcDirs = submoduleDir
-      srcDirs.addAll(['src/com',
-                      'src/org'])
+      srcDirs.addAll(['src/android'])
       java.srcDirs = srcDirs
       resources.srcDirs = srcDirs
       aidl.srcDirs = srcDirs
@@ -121,8 +120,7 @@ android {
     androidTest {
       manifest.srcFile 'AndroidManifest.xml'
       def srcDirs = submoduleDir
-      srcDirs.addAll(['src/com',
-                      'src/org',
+      srcDirs.addAll(['src/android',
                       'src/androidTest'])
       java.srcDirs = srcDirs
       resources.srcDirs = srcDirs
diff --git a/linphoneAndroidSdk.gradle b/linphoneAndroidSdk.gradle
index ac3977bd4..6748a25d3 100644
--- a/linphoneAndroidSdk.gradle
+++ b/linphoneAndroidSdk.gradle
@@ -33,8 +33,7 @@ def srcDirs = ['submodules/mediastreamer2/java/src',
                     'submodules/linphone/java/common',
                     'submodules/linphone/java/impl',
                     'submodules/linphone/coreapi/help/java',
-                    'src/org/',
-                    'src/com']
+                    'src/android']
 
 def excludeFiles = []
 
diff --git a/src/com/android/vending/billing/IInAppBillingService.aidl b/src/android/com/android/vending/billing/IInAppBillingService.aidl
similarity index 100%
rename from src/com/android/vending/billing/IInAppBillingService.aidl
rename to src/android/com/android/vending/billing/IInAppBillingService.aidl
diff --git a/src/org/linphone/AboutFragment.java b/src/android/org/linphone/AboutFragment.java
similarity index 100%
rename from src/org/linphone/AboutFragment.java
rename to src/android/org/linphone/AboutFragment.java
diff --git a/src/org/linphone/AccountEnableReceiver.java b/src/android/org/linphone/AccountEnableReceiver.java
similarity index 100%
rename from src/org/linphone/AccountEnableReceiver.java
rename to src/android/org/linphone/AccountEnableReceiver.java
diff --git a/src/org/linphone/AccountPreferencesFragment.java b/src/android/org/linphone/AccountPreferencesFragment.java
similarity index 100%
rename from src/org/linphone/AccountPreferencesFragment.java
rename to src/android/org/linphone/AccountPreferencesFragment.java
diff --git a/src/org/linphone/BandwidthManager.java b/src/android/org/linphone/BandwidthManager.java
similarity index 100%
rename from src/org/linphone/BandwidthManager.java
rename to src/android/org/linphone/BandwidthManager.java
diff --git a/src/org/linphone/BluetoothManager.java b/src/android/org/linphone/BluetoothManager.java
similarity index 100%
rename from src/org/linphone/BluetoothManager.java
rename to src/android/org/linphone/BluetoothManager.java
diff --git a/src/org/linphone/BootReceiver.java b/src/android/org/linphone/BootReceiver.java
similarity index 100%
rename from src/org/linphone/BootReceiver.java
rename to src/android/org/linphone/BootReceiver.java
diff --git a/src/org/linphone/CallActivity.java b/src/android/org/linphone/CallActivity.java
similarity index 100%
rename from src/org/linphone/CallActivity.java
rename to src/android/org/linphone/CallActivity.java
diff --git a/src/org/linphone/CallAudioFragment.java b/src/android/org/linphone/CallAudioFragment.java
similarity index 100%
rename from src/org/linphone/CallAudioFragment.java
rename to src/android/org/linphone/CallAudioFragment.java
diff --git a/src/org/linphone/CallIncomingActivity.java b/src/android/org/linphone/CallIncomingActivity.java
similarity index 100%
rename from src/org/linphone/CallIncomingActivity.java
rename to src/android/org/linphone/CallIncomingActivity.java
diff --git a/src/org/linphone/CallManager.java b/src/android/org/linphone/CallManager.java
similarity index 100%
rename from src/org/linphone/CallManager.java
rename to src/android/org/linphone/CallManager.java
diff --git a/src/org/linphone/CallOutgoingActivity.java b/src/android/org/linphone/CallOutgoingActivity.java
similarity index 100%
rename from src/org/linphone/CallOutgoingActivity.java
rename to src/android/org/linphone/CallOutgoingActivity.java
diff --git a/src/org/linphone/CallVideoFragment.java b/src/android/org/linphone/CallVideoFragment.java
similarity index 100%
rename from src/org/linphone/CallVideoFragment.java
rename to src/android/org/linphone/CallVideoFragment.java
diff --git a/src/org/linphone/ChatFragment.java b/src/android/org/linphone/ChatFragment.java
similarity index 100%
rename from src/org/linphone/ChatFragment.java
rename to src/android/org/linphone/ChatFragment.java
diff --git a/src/org/linphone/ChatListFragment.java b/src/android/org/linphone/ChatListFragment.java
similarity index 100%
rename from src/org/linphone/ChatListFragment.java
rename to src/android/org/linphone/ChatListFragment.java
diff --git a/src/org/linphone/ContactDetailsFragment.java b/src/android/org/linphone/ContactDetailsFragment.java
similarity index 100%
rename from src/org/linphone/ContactDetailsFragment.java
rename to src/android/org/linphone/ContactDetailsFragment.java
diff --git a/src/org/linphone/ContactEditorFragment.java b/src/android/org/linphone/ContactEditorFragment.java
similarity index 100%
rename from src/org/linphone/ContactEditorFragment.java
rename to src/android/org/linphone/ContactEditorFragment.java
diff --git a/src/org/linphone/ContactsListFragment.java b/src/android/org/linphone/ContactsListFragment.java
similarity index 100%
rename from src/org/linphone/ContactsListFragment.java
rename to src/android/org/linphone/ContactsListFragment.java
diff --git a/src/org/linphone/ContactsManager.java b/src/android/org/linphone/ContactsManager.java
similarity index 100%
rename from src/org/linphone/ContactsManager.java
rename to src/android/org/linphone/ContactsManager.java
diff --git a/src/org/linphone/DialerFragment.java b/src/android/org/linphone/DialerFragment.java
similarity index 100%
rename from src/org/linphone/DialerFragment.java
rename to src/android/org/linphone/DialerFragment.java
diff --git a/src/org/linphone/DozeReceiver.java b/src/android/org/linphone/DozeReceiver.java
similarity index 100%
rename from src/org/linphone/DozeReceiver.java
rename to src/android/org/linphone/DozeReceiver.java
diff --git a/src/org/linphone/EmptyFragment.java b/src/android/org/linphone/EmptyFragment.java
similarity index 100%
rename from src/org/linphone/EmptyFragment.java
rename to src/android/org/linphone/EmptyFragment.java
diff --git a/src/org/linphone/FragmentsAvailable.java b/src/android/org/linphone/FragmentsAvailable.java
similarity index 100%
rename from src/org/linphone/FragmentsAvailable.java
rename to src/android/org/linphone/FragmentsAvailable.java
diff --git a/src/org/linphone/HistoryDetailFragment.java b/src/android/org/linphone/HistoryDetailFragment.java
similarity index 100%
rename from src/org/linphone/HistoryDetailFragment.java
rename to src/android/org/linphone/HistoryDetailFragment.java
diff --git a/src/org/linphone/HistoryListFragment.java b/src/android/org/linphone/HistoryListFragment.java
similarity index 100%
rename from src/org/linphone/HistoryListFragment.java
rename to src/android/org/linphone/HistoryListFragment.java
diff --git a/src/org/linphone/HookReceiver.java b/src/android/org/linphone/HookReceiver.java
similarity index 100%
rename from src/org/linphone/HookReceiver.java
rename to src/android/org/linphone/HookReceiver.java
diff --git a/src/org/linphone/KeepAliveReceiver.java b/src/android/org/linphone/KeepAliveReceiver.java
similarity index 100%
rename from src/org/linphone/KeepAliveReceiver.java
rename to src/android/org/linphone/KeepAliveReceiver.java
diff --git a/src/org/linphone/LinphoneActivity.java b/src/android/org/linphone/LinphoneActivity.java
similarity index 100%
rename from src/org/linphone/LinphoneActivity.java
rename to src/android/org/linphone/LinphoneActivity.java
diff --git a/src/org/linphone/LinphoneContact.java b/src/android/org/linphone/LinphoneContact.java
similarity index 100%
rename from src/org/linphone/LinphoneContact.java
rename to src/android/org/linphone/LinphoneContact.java
diff --git a/src/org/linphone/LinphoneException.java b/src/android/org/linphone/LinphoneException.java
similarity index 100%
rename from src/org/linphone/LinphoneException.java
rename to src/android/org/linphone/LinphoneException.java
diff --git a/src/org/linphone/LinphoneGenericActivity.java b/src/android/org/linphone/LinphoneGenericActivity.java
similarity index 100%
rename from src/org/linphone/LinphoneGenericActivity.java
rename to src/android/org/linphone/LinphoneGenericActivity.java
diff --git a/src/org/linphone/LinphoneLauncherActivity.java b/src/android/org/linphone/LinphoneLauncherActivity.java
similarity index 100%
rename from src/org/linphone/LinphoneLauncherActivity.java
rename to src/android/org/linphone/LinphoneLauncherActivity.java
diff --git a/src/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
similarity index 100%
rename from src/org/linphone/LinphoneManager.java
rename to src/android/org/linphone/LinphoneManager.java
diff --git a/src/org/linphone/LinphoneNumberOrAddress.java b/src/android/org/linphone/LinphoneNumberOrAddress.java
similarity index 100%
rename from src/org/linphone/LinphoneNumberOrAddress.java
rename to src/android/org/linphone/LinphoneNumberOrAddress.java
diff --git a/src/org/linphone/LinphonePreferences.java b/src/android/org/linphone/LinphonePreferences.java
similarity index 100%
rename from src/org/linphone/LinphonePreferences.java
rename to src/android/org/linphone/LinphonePreferences.java
diff --git a/src/org/linphone/LinphoneService.java b/src/android/org/linphone/LinphoneService.java
similarity index 100%
rename from src/org/linphone/LinphoneService.java
rename to src/android/org/linphone/LinphoneService.java
diff --git a/src/org/linphone/LinphoneUtils.java b/src/android/org/linphone/LinphoneUtils.java
similarity index 100%
rename from src/org/linphone/LinphoneUtils.java
rename to src/android/org/linphone/LinphoneUtils.java
diff --git a/src/org/linphone/NetworkManager.java b/src/android/org/linphone/NetworkManager.java
similarity index 100%
rename from src/org/linphone/NetworkManager.java
rename to src/android/org/linphone/NetworkManager.java
diff --git a/src/org/linphone/PhoneStateChangedReceiver.java b/src/android/org/linphone/PhoneStateChangedReceiver.java
similarity index 100%
rename from src/org/linphone/PhoneStateChangedReceiver.java
rename to src/android/org/linphone/PhoneStateChangedReceiver.java
diff --git a/src/org/linphone/PreferencesMigrator.java b/src/android/org/linphone/PreferencesMigrator.java
similarity index 100%
rename from src/org/linphone/PreferencesMigrator.java
rename to src/android/org/linphone/PreferencesMigrator.java
diff --git a/src/org/linphone/SettingsFragment.java b/src/android/org/linphone/SettingsFragment.java
similarity index 100%
rename from src/org/linphone/SettingsFragment.java
rename to src/android/org/linphone/SettingsFragment.java
diff --git a/src/org/linphone/StatusFragment.java b/src/android/org/linphone/StatusFragment.java
similarity index 100%
rename from src/org/linphone/StatusFragment.java
rename to src/android/org/linphone/StatusFragment.java
diff --git a/src/org/linphone/UIThreadDispatcher.java b/src/android/org/linphone/UIThreadDispatcher.java
similarity index 100%
rename from src/org/linphone/UIThreadDispatcher.java
rename to src/android/org/linphone/UIThreadDispatcher.java
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java
similarity index 100%
rename from src/org/linphone/assistant/AssistantActivity.java
rename to src/android/org/linphone/assistant/AssistantActivity.java
diff --git a/src/org/linphone/assistant/AssistantFragmentsEnum.java b/src/android/org/linphone/assistant/AssistantFragmentsEnum.java
similarity index 100%
rename from src/org/linphone/assistant/AssistantFragmentsEnum.java
rename to src/android/org/linphone/assistant/AssistantFragmentsEnum.java
diff --git a/src/org/linphone/assistant/CodecDownloaderFragment.java b/src/android/org/linphone/assistant/CodecDownloaderFragment.java
similarity index 100%
rename from src/org/linphone/assistant/CodecDownloaderFragment.java
rename to src/android/org/linphone/assistant/CodecDownloaderFragment.java
diff --git a/src/org/linphone/assistant/CountryListFragment.java b/src/android/org/linphone/assistant/CountryListFragment.java
similarity index 100%
rename from src/org/linphone/assistant/CountryListFragment.java
rename to src/android/org/linphone/assistant/CountryListFragment.java
diff --git a/src/org/linphone/assistant/CreateAccountActivationFragment.java b/src/android/org/linphone/assistant/CreateAccountActivationFragment.java
similarity index 100%
rename from src/org/linphone/assistant/CreateAccountActivationFragment.java
rename to src/android/org/linphone/assistant/CreateAccountActivationFragment.java
diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/android/org/linphone/assistant/CreateAccountCodeActivationFragment.java
similarity index 100%
rename from src/org/linphone/assistant/CreateAccountCodeActivationFragment.java
rename to src/android/org/linphone/assistant/CreateAccountCodeActivationFragment.java
diff --git a/src/org/linphone/assistant/CreateAccountFragment.java b/src/android/org/linphone/assistant/CreateAccountFragment.java
similarity index 100%
rename from src/org/linphone/assistant/CreateAccountFragment.java
rename to src/android/org/linphone/assistant/CreateAccountFragment.java
diff --git a/src/org/linphone/assistant/EchoCancellerCalibrationFragment.java b/src/android/org/linphone/assistant/EchoCancellerCalibrationFragment.java
similarity index 100%
rename from src/org/linphone/assistant/EchoCancellerCalibrationFragment.java
rename to src/android/org/linphone/assistant/EchoCancellerCalibrationFragment.java
diff --git a/src/org/linphone/assistant/LinphoneLoginFragment.java b/src/android/org/linphone/assistant/LinphoneLoginFragment.java
similarity index 100%
rename from src/org/linphone/assistant/LinphoneLoginFragment.java
rename to src/android/org/linphone/assistant/LinphoneLoginFragment.java
diff --git a/src/org/linphone/assistant/LoginFragment.java b/src/android/org/linphone/assistant/LoginFragment.java
similarity index 100%
rename from src/org/linphone/assistant/LoginFragment.java
rename to src/android/org/linphone/assistant/LoginFragment.java
diff --git a/src/org/linphone/assistant/RemoteProvisioningActivity.java b/src/android/org/linphone/assistant/RemoteProvisioningActivity.java
similarity index 100%
rename from src/org/linphone/assistant/RemoteProvisioningActivity.java
rename to src/android/org/linphone/assistant/RemoteProvisioningActivity.java
diff --git a/src/org/linphone/assistant/RemoteProvisioningFragment.java b/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
similarity index 100%
rename from src/org/linphone/assistant/RemoteProvisioningFragment.java
rename to src/android/org/linphone/assistant/RemoteProvisioningFragment.java
diff --git a/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java b/src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java
similarity index 100%
rename from src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
rename to src/android/org/linphone/assistant/RemoteProvisioningLoginActivity.java
diff --git a/src/org/linphone/assistant/WelcomeFragment.java b/src/android/org/linphone/assistant/WelcomeFragment.java
similarity index 100%
rename from src/org/linphone/assistant/WelcomeFragment.java
rename to src/android/org/linphone/assistant/WelcomeFragment.java
diff --git a/src/org/linphone/compatibility/ApiElevenPlus.java b/src/android/org/linphone/compatibility/ApiElevenPlus.java
similarity index 100%
rename from src/org/linphone/compatibility/ApiElevenPlus.java
rename to src/android/org/linphone/compatibility/ApiElevenPlus.java
diff --git a/src/org/linphone/compatibility/ApiNineteenPlus.java b/src/android/org/linphone/compatibility/ApiNineteenPlus.java
similarity index 100%
rename from src/org/linphone/compatibility/ApiNineteenPlus.java
rename to src/android/org/linphone/compatibility/ApiNineteenPlus.java
diff --git a/src/org/linphone/compatibility/ApiSixteenPlus.java b/src/android/org/linphone/compatibility/ApiSixteenPlus.java
similarity index 100%
rename from src/org/linphone/compatibility/ApiSixteenPlus.java
rename to src/android/org/linphone/compatibility/ApiSixteenPlus.java
diff --git a/src/org/linphone/compatibility/ApiTwentyOnePlus.java b/src/android/org/linphone/compatibility/ApiTwentyOnePlus.java
similarity index 100%
rename from src/org/linphone/compatibility/ApiTwentyOnePlus.java
rename to src/android/org/linphone/compatibility/ApiTwentyOnePlus.java
diff --git a/src/org/linphone/compatibility/ApiTwentyThreePlus.java b/src/android/org/linphone/compatibility/ApiTwentyThreePlus.java
similarity index 100%
rename from src/org/linphone/compatibility/ApiTwentyThreePlus.java
rename to src/android/org/linphone/compatibility/ApiTwentyThreePlus.java
diff --git a/src/org/linphone/compatibility/Compatibility.java b/src/android/org/linphone/compatibility/Compatibility.java
similarity index 100%
rename from src/org/linphone/compatibility/Compatibility.java
rename to src/android/org/linphone/compatibility/Compatibility.java
diff --git a/src/org/linphone/compatibility/CompatibilityScaleGestureDetector.java b/src/android/org/linphone/compatibility/CompatibilityScaleGestureDetector.java
similarity index 100%
rename from src/org/linphone/compatibility/CompatibilityScaleGestureDetector.java
rename to src/android/org/linphone/compatibility/CompatibilityScaleGestureDetector.java
diff --git a/src/org/linphone/compatibility/CompatibilityScaleGestureListener.java b/src/android/org/linphone/compatibility/CompatibilityScaleGestureListener.java
similarity index 100%
rename from src/org/linphone/compatibility/CompatibilityScaleGestureListener.java
rename to src/android/org/linphone/compatibility/CompatibilityScaleGestureListener.java
diff --git a/src/org/linphone/firebase/FirebaseIdService.java b/src/android/org/linphone/firebase/FirebaseIdService.java
similarity index 100%
rename from src/org/linphone/firebase/FirebaseIdService.java
rename to src/android/org/linphone/firebase/FirebaseIdService.java
diff --git a/src/org/linphone/firebase/FirebaseMessaging.java b/src/android/org/linphone/firebase/FirebaseMessaging.java
similarity index 100%
rename from src/org/linphone/firebase/FirebaseMessaging.java
rename to src/android/org/linphone/firebase/FirebaseMessaging.java
diff --git a/src/org/linphone/gcm/GCMReceiver.java b/src/android/org/linphone/gcm/GCMReceiver.java
similarity index 100%
rename from src/org/linphone/gcm/GCMReceiver.java
rename to src/android/org/linphone/gcm/GCMReceiver.java
diff --git a/src/org/linphone/gcm/GCMService.java b/src/android/org/linphone/gcm/GCMService.java
similarity index 100%
rename from src/org/linphone/gcm/GCMService.java
rename to src/android/org/linphone/gcm/GCMService.java
diff --git a/src/org/linphone/purchase/InAppPurchaseActivity.java b/src/android/org/linphone/purchase/InAppPurchaseActivity.java
similarity index 100%
rename from src/org/linphone/purchase/InAppPurchaseActivity.java
rename to src/android/org/linphone/purchase/InAppPurchaseActivity.java
diff --git a/src/org/linphone/purchase/InAppPurchaseFragment.java b/src/android/org/linphone/purchase/InAppPurchaseFragment.java
similarity index 100%
rename from src/org/linphone/purchase/InAppPurchaseFragment.java
rename to src/android/org/linphone/purchase/InAppPurchaseFragment.java
diff --git a/src/org/linphone/purchase/InAppPurchaseHelper.java b/src/android/org/linphone/purchase/InAppPurchaseHelper.java
similarity index 100%
rename from src/org/linphone/purchase/InAppPurchaseHelper.java
rename to src/android/org/linphone/purchase/InAppPurchaseHelper.java
diff --git a/src/org/linphone/purchase/InAppPurchaseListFragment.java b/src/android/org/linphone/purchase/InAppPurchaseListFragment.java
similarity index 100%
rename from src/org/linphone/purchase/InAppPurchaseListFragment.java
rename to src/android/org/linphone/purchase/InAppPurchaseListFragment.java
diff --git a/src/org/linphone/purchase/InAppPurchaseListener.java b/src/android/org/linphone/purchase/InAppPurchaseListener.java
similarity index 100%
rename from src/org/linphone/purchase/InAppPurchaseListener.java
rename to src/android/org/linphone/purchase/InAppPurchaseListener.java
diff --git a/src/org/linphone/purchase/InAppPurchaseListenerBase.java b/src/android/org/linphone/purchase/InAppPurchaseListenerBase.java
similarity index 100%
rename from src/org/linphone/purchase/InAppPurchaseListenerBase.java
rename to src/android/org/linphone/purchase/InAppPurchaseListenerBase.java
diff --git a/src/org/linphone/purchase/Purchasable.java b/src/android/org/linphone/purchase/Purchasable.java
similarity index 100%
rename from src/org/linphone/purchase/Purchasable.java
rename to src/android/org/linphone/purchase/Purchasable.java
diff --git a/src/org/linphone/sync/AuthenticationService.java b/src/android/org/linphone/sync/AuthenticationService.java
similarity index 100%
rename from src/org/linphone/sync/AuthenticationService.java
rename to src/android/org/linphone/sync/AuthenticationService.java
diff --git a/src/org/linphone/sync/Authenticator.java b/src/android/org/linphone/sync/Authenticator.java
similarity index 100%
rename from src/org/linphone/sync/Authenticator.java
rename to src/android/org/linphone/sync/Authenticator.java
diff --git a/src/org/linphone/sync/SyncAdapter.java b/src/android/org/linphone/sync/SyncAdapter.java
similarity index 100%
rename from src/org/linphone/sync/SyncAdapter.java
rename to src/android/org/linphone/sync/SyncAdapter.java
diff --git a/src/org/linphone/sync/SyncService.java b/src/android/org/linphone/sync/SyncService.java
similarity index 100%
rename from src/org/linphone/sync/SyncService.java
rename to src/android/org/linphone/sync/SyncService.java
diff --git a/src/org/linphone/tutorials/AndroidTutorialNotifier.java b/src/android/org/linphone/tutorials/AndroidTutorialNotifier.java
similarity index 100%
rename from src/org/linphone/tutorials/AndroidTutorialNotifier.java
rename to src/android/org/linphone/tutorials/AndroidTutorialNotifier.java
diff --git a/src/org/linphone/tutorials/TutorialBuddyStatusActivity.java b/src/android/org/linphone/tutorials/TutorialBuddyStatusActivity.java
similarity index 100%
rename from src/org/linphone/tutorials/TutorialBuddyStatusActivity.java
rename to src/android/org/linphone/tutorials/TutorialBuddyStatusActivity.java
diff --git a/src/org/linphone/tutorials/TutorialCardDavSync.java b/src/android/org/linphone/tutorials/TutorialCardDavSync.java
similarity index 100%
rename from src/org/linphone/tutorials/TutorialCardDavSync.java
rename to src/android/org/linphone/tutorials/TutorialCardDavSync.java
diff --git a/src/org/linphone/tutorials/TutorialChatRoomActivity.java b/src/android/org/linphone/tutorials/TutorialChatRoomActivity.java
similarity index 100%
rename from src/org/linphone/tutorials/TutorialChatRoomActivity.java
rename to src/android/org/linphone/tutorials/TutorialChatRoomActivity.java
diff --git a/src/org/linphone/tutorials/TutorialHelloWorldActivity.java b/src/android/org/linphone/tutorials/TutorialHelloWorldActivity.java
similarity index 100%
rename from src/org/linphone/tutorials/TutorialHelloWorldActivity.java
rename to src/android/org/linphone/tutorials/TutorialHelloWorldActivity.java
diff --git a/src/org/linphone/tutorials/TutorialLauncherActivity.java b/src/android/org/linphone/tutorials/TutorialLauncherActivity.java
similarity index 100%
rename from src/org/linphone/tutorials/TutorialLauncherActivity.java
rename to src/android/org/linphone/tutorials/TutorialLauncherActivity.java
diff --git a/src/org/linphone/tutorials/TutorialRegistrationActivity.java b/src/android/org/linphone/tutorials/TutorialRegistrationActivity.java
similarity index 100%
rename from src/org/linphone/tutorials/TutorialRegistrationActivity.java
rename to src/android/org/linphone/tutorials/TutorialRegistrationActivity.java
diff --git a/src/org/linphone/ui/AddressAware.java b/src/android/org/linphone/ui/AddressAware.java
similarity index 100%
rename from src/org/linphone/ui/AddressAware.java
rename to src/android/org/linphone/ui/AddressAware.java
diff --git a/src/org/linphone/ui/AddressText.java b/src/android/org/linphone/ui/AddressText.java
similarity index 100%
rename from src/org/linphone/ui/AddressText.java
rename to src/android/org/linphone/ui/AddressText.java
diff --git a/src/org/linphone/ui/CallButton.java b/src/android/org/linphone/ui/CallButton.java
similarity index 100%
rename from src/org/linphone/ui/CallButton.java
rename to src/android/org/linphone/ui/CallButton.java
diff --git a/src/org/linphone/ui/Digit.java b/src/android/org/linphone/ui/Digit.java
similarity index 100%
rename from src/org/linphone/ui/Digit.java
rename to src/android/org/linphone/ui/Digit.java
diff --git a/src/org/linphone/ui/EraseButton.java b/src/android/org/linphone/ui/EraseButton.java
similarity index 100%
rename from src/org/linphone/ui/EraseButton.java
rename to src/android/org/linphone/ui/EraseButton.java
diff --git a/src/org/linphone/ui/LedPreference.java b/src/android/org/linphone/ui/LedPreference.java
similarity index 100%
rename from src/org/linphone/ui/LedPreference.java
rename to src/android/org/linphone/ui/LedPreference.java
diff --git a/src/org/linphone/ui/LinphoneOverlay.java b/src/android/org/linphone/ui/LinphoneOverlay.java
similarity index 100%
rename from src/org/linphone/ui/LinphoneOverlay.java
rename to src/android/org/linphone/ui/LinphoneOverlay.java
diff --git a/src/org/linphone/ui/LinphoneScrollView.java b/src/android/org/linphone/ui/LinphoneScrollView.java
similarity index 100%
rename from src/org/linphone/ui/LinphoneScrollView.java
rename to src/android/org/linphone/ui/LinphoneScrollView.java
diff --git a/src/org/linphone/ui/LinphoneSliders.java b/src/android/org/linphone/ui/LinphoneSliders.java
similarity index 100%
rename from src/org/linphone/ui/LinphoneSliders.java
rename to src/android/org/linphone/ui/LinphoneSliders.java
diff --git a/src/org/linphone/ui/Numpad.java b/src/android/org/linphone/ui/Numpad.java
similarity index 100%
rename from src/org/linphone/ui/Numpad.java
rename to src/android/org/linphone/ui/Numpad.java
diff --git a/src/org/linphone/ui/PreferencesListFragment.java b/src/android/org/linphone/ui/PreferencesListFragment.java
similarity index 100%
rename from src/org/linphone/ui/PreferencesListFragment.java
rename to src/android/org/linphone/ui/PreferencesListFragment.java
diff --git a/src/org/linphone/ui/ScrollViewListener.java b/src/android/org/linphone/ui/ScrollViewListener.java
similarity index 100%
rename from src/org/linphone/ui/ScrollViewListener.java
rename to src/android/org/linphone/ui/ScrollViewListener.java
diff --git a/src/org/linphone/ui/SlidingDrawer.java b/src/android/org/linphone/ui/SlidingDrawer.java
similarity index 100%
rename from src/org/linphone/ui/SlidingDrawer.java
rename to src/android/org/linphone/ui/SlidingDrawer.java
diff --git a/src/org/linphone/xmlrpc/XmlRpcHelper.java b/src/android/org/linphone/xmlrpc/XmlRpcHelper.java
similarity index 100%
rename from src/org/linphone/xmlrpc/XmlRpcHelper.java
rename to src/android/org/linphone/xmlrpc/XmlRpcHelper.java
diff --git a/src/org/linphone/xmlrpc/XmlRpcListener.java b/src/android/org/linphone/xmlrpc/XmlRpcListener.java
similarity index 100%
rename from src/org/linphone/xmlrpc/XmlRpcListener.java
rename to src/android/org/linphone/xmlrpc/XmlRpcListener.java
diff --git a/src/org/linphone/xmlrpc/XmlRpcListenerBase.java b/src/android/org/linphone/xmlrpc/XmlRpcListenerBase.java
similarity index 100%
rename from src/org/linphone/xmlrpc/XmlRpcListenerBase.java
rename to src/android/org/linphone/xmlrpc/XmlRpcListenerBase.java
diff --git a/src/androidTest/java/AccountAssistant.java b/src/androidTest/org/linphone/ui/tester/AccountAssistant.java
similarity index 99%
rename from src/androidTest/java/AccountAssistant.java
rename to src/androidTest/org/linphone/ui/tester/AccountAssistant.java
index 6916acc2e..b8ce4835c 100644
--- a/src/androidTest/java/AccountAssistant.java
+++ b/src/androidTest/org/linphone/ui/tester/AccountAssistant.java
@@ -1,3 +1,5 @@
+package org.linphone.ui.tester;
+
 import junit.framework.Assert;
 
 import org.linphone.LinphoneActivity;
diff --git a/src/androidTest/java/AccountManagement.java b/src/androidTest/org/linphone/ui/tester/AccountManagement.java
similarity index 98%
rename from src/androidTest/java/AccountManagement.java
rename to src/androidTest/org/linphone/ui/tester/AccountManagement.java
index 4571347f9..32135750e 100644
--- a/src/androidTest/java/AccountManagement.java
+++ b/src/androidTest/org/linphone/ui/tester/AccountManagement.java
@@ -1,3 +1,5 @@
+package org.linphone.ui.tester;
+
 import junit.framework.Assert;
 
 import org.linphone.FragmentsAvailable;
diff --git a/src/androidTest/java/AinitTestEnv.java b/src/androidTest/org/linphone/ui/tester/AinitTestEnv.java
similarity index 94%
rename from src/androidTest/java/AinitTestEnv.java
rename to src/androidTest/org/linphone/ui/tester/AinitTestEnv.java
index 7657e8d88..7fbb9c48e 100644
--- a/src/androidTest/java/AinitTestEnv.java
+++ b/src/androidTest/org/linphone/ui/tester/AinitTestEnv.java
@@ -1,3 +1,5 @@
+package org.linphone.ui.tester;
+
 import junit.framework.Assert;
 
 import android.test.suitebuilder.annotation.LargeTest;
diff --git a/src/androidTest/java/CallsAudio.java b/src/androidTest/org/linphone/ui/tester/CallsAudio.java
similarity index 99%
rename from src/androidTest/java/CallsAudio.java
rename to src/androidTest/org/linphone/ui/tester/CallsAudio.java
index a0daa759c..68305880e 100644
--- a/src/androidTest/java/CallsAudio.java
+++ b/src/androidTest/org/linphone/ui/tester/CallsAudio.java
@@ -1,3 +1,5 @@
+package org.linphone.ui.tester;
+
 import junit.framework.Assert;
 
 import org.linphone.CallActivity;
diff --git a/src/androidTest/java/CallsVideo.java b/src/androidTest/org/linphone/ui/tester/CallsVideo.java
similarity index 99%
rename from src/androidTest/java/CallsVideo.java
rename to src/androidTest/org/linphone/ui/tester/CallsVideo.java
index d5d1d4a14..172637b13 100644
--- a/src/androidTest/java/CallsVideo.java
+++ b/src/androidTest/org/linphone/ui/tester/CallsVideo.java
@@ -1,3 +1,5 @@
+package org.linphone.ui.tester;
+
 import junit.framework.Assert;
 
 import org.linphone.CallActivity;
diff --git a/src/androidTest/java/Chat.java b/src/androidTest/org/linphone/ui/tester/Chat.java
similarity index 99%
rename from src/androidTest/java/Chat.java
rename to src/androidTest/org/linphone/ui/tester/Chat.java
index d45b87a32..d01b65991 100644
--- a/src/androidTest/java/Chat.java
+++ b/src/androidTest/org/linphone/ui/tester/Chat.java
@@ -1,3 +1,5 @@
+package org.linphone.ui.tester;
+
 import junit.framework.Assert;
 
 import org.linphone.LinphoneActivity;
diff --git a/src/androidTest/java/ConferenceAndMultiCall.java b/src/androidTest/org/linphone/ui/tester/ConferenceAndMultiCall.java
similarity index 99%
rename from src/androidTest/java/ConferenceAndMultiCall.java
rename to src/androidTest/org/linphone/ui/tester/ConferenceAndMultiCall.java
index bb82241d7..69ca66664 100644
--- a/src/androidTest/java/ConferenceAndMultiCall.java
+++ b/src/androidTest/org/linphone/ui/tester/ConferenceAndMultiCall.java
@@ -1,3 +1,5 @@
+package org.linphone.ui.tester;
+
 import java.util.ArrayList;
 
 import junit.framework.Assert;
diff --git a/src/androidTest/java/Contacts.java b/src/androidTest/org/linphone/ui/tester/Contacts.java
similarity index 99%
rename from src/androidTest/java/Contacts.java
rename to src/androidTest/org/linphone/ui/tester/Contacts.java
index b5ed0ecff..1b08f0226 100644
--- a/src/androidTest/java/Contacts.java
+++ b/src/androidTest/org/linphone/ui/tester/Contacts.java
@@ -1,3 +1,5 @@
+package org.linphone.ui.tester;
+
 import junit.framework.Assert;
 
 import org.linphone.ContactsListFragment;
diff --git a/src/androidTest/java/History.java b/src/androidTest/org/linphone/ui/tester/History.java
similarity index 98%
rename from src/androidTest/java/History.java
rename to src/androidTest/org/linphone/ui/tester/History.java
index d6f483b6b..095d5d8d7 100644
--- a/src/androidTest/java/History.java
+++ b/src/androidTest/org/linphone/ui/tester/History.java
@@ -1,3 +1,5 @@
+package org.linphone.ui.tester;
+
 import junit.framework.Assert;
 
 import org.linphone.CallActivity;
diff --git a/src/androidTest/java/LinphoneTestManager.java b/src/androidTest/org/linphone/ui/tester/LinphoneTestManager.java
similarity index 99%
rename from src/androidTest/java/LinphoneTestManager.java
rename to src/androidTest/org/linphone/ui/tester/LinphoneTestManager.java
index 64105b849..b3debaf3c 100644
--- a/src/androidTest/java/LinphoneTestManager.java
+++ b/src/androidTest/org/linphone/ui/tester/LinphoneTestManager.java
@@ -1,3 +1,5 @@
+package org.linphone.ui.tester;
+
 import java.nio.ByteBuffer;
 import java.util.Timer;
 import java.util.TimerTask;
diff --git a/src/androidTest/java/SampleTest.java b/src/androidTest/org/linphone/ui/tester/SampleTest.java
similarity index 98%
rename from src/androidTest/java/SampleTest.java
rename to src/androidTest/org/linphone/ui/tester/SampleTest.java
index e68f44787..3fc5bfefb 100644
--- a/src/androidTest/java/SampleTest.java
+++ b/src/androidTest/org/linphone/ui/tester/SampleTest.java
@@ -1,3 +1,5 @@
+package org.linphone.ui.tester;
+
 import org.linphone.LinphoneLauncherActivity;
 import org.linphone.LinphoneManager;
 import org.linphone.core.LinphoneCall;
diff --git a/src/androidTest/java/Transfer.java b/src/androidTest/org/linphone/ui/tester/Transfer.java
similarity index 98%
rename from src/androidTest/java/Transfer.java
rename to src/androidTest/org/linphone/ui/tester/Transfer.java
index c168595bd..9bdfa625a 100644
--- a/src/androidTest/java/Transfer.java
+++ b/src/androidTest/org/linphone/ui/tester/Transfer.java
@@ -1,3 +1,5 @@
+package org.linphone.ui.tester;
+
 import junit.framework.Assert;
 
 import org.linphone.CallActivity;
diff --git a/src/androidTest/java/ZShutdownTestEnv.java b/src/androidTest/org/linphone/ui/tester/ZShutdownTestEnv.java
similarity index 94%
rename from src/androidTest/java/ZShutdownTestEnv.java
rename to src/androidTest/org/linphone/ui/tester/ZShutdownTestEnv.java
index 3d32f5889..f7044496b 100644
--- a/src/androidTest/java/ZShutdownTestEnv.java
+++ b/src/androidTest/org/linphone/ui/tester/ZShutdownTestEnv.java
@@ -1,3 +1,5 @@
+package org.linphone.ui.tester;
+
 import static android.content.Intent.ACTION_MAIN;
 
 import org.linphone.LinphoneService;