From 7656cff3bbb92aefbbe01d59f746d5e7f3bd9445 Mon Sep 17 00:00:00 2001
From: masensio <masensio@solidgear.es>
Date: Thu, 24 Oct 2013 18:12:00 +0200
Subject: [PATCH] Update package name

---
 AndroidManifest.xml                                |  2 +-
 oc_jb_workaround/AndroidManifest.xml               |  2 +-
 .../accounts/AccountAuthenticatorService.java      |  4 +-
 pom.xml                                            |  2 +-
 res/layout/file_preview.xml                        |  2 +-
 res/layout/list_fragment.xml                       |  2 +-
 res/layout/pincodelock.xml                         |  2 +-
 res/layout/sso_dialog.xml                          |  2 +-
 res/layout/upload_files_layout.xml                 |  2 +-
 res/raw-de/changelog.html                          |  2 +-
 res/raw-es/changelog.html                          |  2 +-
 res/raw/changelog.html                             |  2 +-
 res/values/oauth2_configuration.xml                |  2 +-
 res/values/setup.xml                               |  2 +-
 .../debitel/cloud}/android/DisplayUtils.java       |  2 +-
 .../mobilcom/debitel/cloud}/android/Log_OC.java    |  2 +-
 .../mobilcom/debitel/cloud}/android/MainApp.java   |  2 +-
 .../debitel/cloud}/android/OwnCloudSession.java    |  2 +-
 .../mobilcom/debitel/cloud}/android/Uploader.java  | 14 ++---
 .../authentication/AccountAuthenticator.java       | 14 ++---
 .../AccountAuthenticatorActivity.java              |  2 +-
 .../AccountAuthenticatorService.java               |  2 +-
 .../android/authentication/AccountUtils.java       |  6 +-
 .../authentication/AuthenticatorActivity.java      | 35 +++++------
 .../android/authentication/OAuth2Constants.java    |  2 +-
 .../android/authentication/SsoWebViewClient.java   |  4 +-
 .../android/datamodel/DataStorageManager.java      |  2 +-
 .../android/datamodel/FileDataStorageManager.java  | 10 ++--
 .../debitel/cloud}/android/datamodel/OCFile.java   |  4 +-
 .../debitel/cloud}/android/db/DbHandler.java       |  6 +-
 .../debitel/cloud}/android/db/ProviderMeta.java    |  4 +-
 .../extensions/ExtensionsAvailableActivity.java    |  2 +-
 .../extensions/ExtensionsAvailableDialog.java      |  6 +-
 .../android/extensions/ExtensionsListActivity.java |  6 +-
 .../android/files/BootupBroadcastReceiver.java     |  6 +-
 .../debitel/cloud}/android/files/FileHandler.java  |  4 +-
 .../files/InstantUploadBroadcastReceiver.java      | 14 ++---
 .../cloud}/android/files/OwnCloudFileObserver.java | 16 ++---
 .../files/managers/OCNotificationManager.java      |  4 +-
 .../android/files/services/FileDownloader.java     | 30 +++++-----
 .../files/services/FileObserverService.java        | 16 ++---
 .../android/files/services/FileUploader.java       | 48 +++++++--------
 .../files/services/OnUploadCompletedListener.java  |  2 +-
 .../location/LocationServiceLauncherReciever.java  |  8 +--
 .../android/location/LocationUpdateService.java    |  6 +-
 .../cloud}/android/media/MediaControlView.java     |  4 +-
 .../debitel/cloud}/android/media/MediaService.java | 14 ++---
 .../cloud}/android/media/MediaServiceBinder.java   |  8 +--
 .../android/network/AdvancedSslSocketFactory.java  |  4 +-
 .../android/network/AdvancedX509TrustManager.java  |  4 +-
 .../cloud}/android/network/BearerAuthScheme.java   |  4 +-
 .../cloud}/android/network/BearerCredentials.java  |  2 +-
 .../network/CertificateCombinedException.java      |  2 +-
 .../android/network/OwnCloudClientUtils.java       | 12 ++--
 .../android/network/ProgressiveDataTransferer.java |  2 +-
 .../operations/ChunkedUploadFileOperation.java     |  8 +--
 .../android/operations/CreateFolderOperation.java  |  8 +--
 .../android/operations/DownloadFileOperation.java  | 12 ++--
 .../operations/ExistenceCheckOperation.java        |  4 +-
 .../android/operations/OAuth2GetAccessToken.java   |  8 +--
 .../operations/OnRemoteOperationListener.java      |  2 +-
 .../operations/OperationCancelledException.java    |  2 +-
 .../operations/OwnCloudServerCheckOperation.java   |  8 +--
 .../cloud}/android/operations/RemoteOperation.java | 12 ++--
 .../android/operations/RemoteOperationResult.java  |  8 +--
 .../android/operations/RemoveFileOperation.java    |  8 +--
 .../android/operations/RenameFileOperation.java    | 12 ++--
 .../operations/SynchronizeFileOperation.java       | 14 ++---
 .../operations/SynchronizeFolderOperation.java     | 12 ++--
 .../operations/UpdateOCVersionOperation.java       | 12 ++--
 .../android/operations/UploadFileOperation.java    | 18 +++---
 .../android/providers/FileContentProvider.java     | 10 ++--
 .../syncadapter/AbstractOwnCloudSyncAdapter.java   | 10 ++--
 .../android/syncadapter/ContactSyncAdapter.java    |  6 +-
 .../android/syncadapter/ContactSyncService.java    |  2 +-
 .../android/syncadapter/FileSyncAdapter.java       | 26 ++++----
 .../android/syncadapter/FileSyncService.java       |  2 +-
 .../debitel/cloud}/android/ui/ActionItem.java      |  2 +-
 .../debitel/cloud}/android/ui/CustomPopup.java     |  2 +-
 .../cloud}/android/ui/ExtendedListView.java        |  2 +-
 .../debitel/cloud}/android/ui/QuickAction.java     |  4 +-
 .../android/ui/activity/AccountSelectActivity.java | 14 ++---
 .../ui/activity/ConflictsResolveActivity.java      | 18 +++---
 .../ErrorsWhileCopyingHandlerActivity.java         | 15 ++---
 .../android/ui/activity/FailedUploadActivity.java  |  4 +-
 .../cloud}/android/ui/activity/FileActivity.java   | 19 +++---
 .../android/ui/activity/FileDisplayActivity.java   | 69 +++++++++++-----------
 .../ui/activity/GenericExplanationActivity.java    |  5 +-
 .../android/ui/activity/InstantUploadActivity.java | 18 +++---
 .../android/ui/activity/LandingActivity.java       | 10 ++--
 .../android/ui/activity/LogHistoryActivity.java    |  9 +--
 .../android/ui/activity/PinCodeActivity.java       |  8 +--
 .../cloud}/android/ui/activity/Preferences.java    | 13 ++--
 .../android/ui/activity/PreferencesNewSession.java |  2 +-
 .../android/ui/activity/TransferServiceGetter.java |  6 +-
 .../android/ui/activity/UploadFilesActivity.java   | 18 +++---
 .../android/ui/adapter/FileListListAdapter.java    | 18 +++---
 .../android/ui/adapter/LandingScreenAdapter.java   | 10 ++--
 .../android/ui/adapter/LocalFileListAdapter.java   |  6 +-
 .../cloud}/android/ui/adapter/LogListAdapter.java  |  4 +-
 .../cloud}/android/ui/dialog/ChangelogDialog.java  |  5 +-
 .../android/ui/dialog/ConflictsResolveDialog.java  |  5 +-
 .../cloud}/android/ui/dialog/EditNameDialog.java   |  5 +-
 .../ui/dialog/IndeterminateProgressDialog.java     |  5 +-
 .../cloud}/android/ui/dialog/LoadingDialog.java    |  4 +-
 .../android/ui/dialog/SamlWebViewDialog.java       | 11 ++--
 .../android/ui/dialog/SslValidatorDialog.java      | 12 ++--
 .../cloud}/android/ui/dialog/SsoWebView.java       |  2 +-
 .../AuthenticatorAccountDetailsFragment.java       |  2 +-
 .../fragment/AuthenticatorGetStartedFragment.java  |  2 +-
 .../ui/fragment/ConfirmationDialogFragment.java    |  5 +-
 .../android/ui/fragment/ExtendedListFragment.java  |  9 +--
 .../android/ui/fragment/FileDetailFragment.java    | 47 +++++++--------
 .../cloud}/android/ui/fragment/FileFragment.java   |  9 +--
 .../android/ui/fragment/LandingPageFragment.java   |  8 +--
 .../android/ui/fragment/LocalFileListFragment.java |  8 +--
 .../android/ui/fragment/OCFileListFragment.java    | 46 +++++++--------
 .../android/ui/preview/FileDownloadFragment.java   | 12 ++--
 .../android/ui/preview/PreviewImageActivity.java   | 32 +++++-----
 .../android/ui/preview/PreviewImageFragment.java   | 24 ++++----
 .../ui/preview/PreviewImagePagerAdapter.java       |  8 +--
 .../android/ui/preview/PreviewMediaFragment.java   | 34 +++++------
 .../android/ui/preview/PreviewVideoActivity.java   | 20 +++----
 .../cloud}/android/utils/FileStorageUtils.java     |  8 +--
 .../cloud}/android/utils/OwnCloudVersion.java      |  2 +-
 .../android/utils/RecursiveFileObserver.java       |  2 +-
 .../cloud}/android/widgets/ActionEditText.java     |  4 +-
 .../webdav/ChunkFromFileChannelRequestEntity.java  |  4 +-
 src/eu/alefzero/webdav/FileRequestEntity.java      |  4 +-
 src/eu/alefzero/webdav/WebdavClient.java           |  8 +--
 src/eu/alefzero/webdav/WebdavEntry.java            |  2 +-
 tests/.classpath                                   |  3 +-
 tests/AndroidManifest.xml                          | 10 ++--
 .../owncloud/android/test/AccountUtilsTest.java    | 59 ------------------
 .../cloud/android/test/AccountUtilsTest.java       | 59 ++++++++++++++++++
 .../android/test/FileContentProviderTest.java      |  8 +--
 136 files changed, 676 insertions(+), 659 deletions(-)
 rename oc_jb_workaround/src/{com/owncloud => de/mobilcom/debitel/cloud}/android/workaround/accounts/AccountAuthenticatorService.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/DisplayUtils.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/Log_OC.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/MainApp.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/OwnCloudSession.java (93%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/Uploader.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/authentication/AccountAuthenticator.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/authentication/AccountAuthenticatorActivity.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/authentication/AccountAuthenticatorService.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/authentication/AccountUtils.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/authentication/AuthenticatorActivity.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/authentication/OAuth2Constants.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/authentication/SsoWebViewClient.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/datamodel/DataStorageManager.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/datamodel/FileDataStorageManager.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/datamodel/OCFile.java (99%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/db/DbHandler.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/db/ProviderMeta.java (94%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/extensions/ExtensionsAvailableActivity.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/extensions/ExtensionsAvailableDialog.java (93%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/extensions/ExtensionsListActivity.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/files/BootupBroadcastReceiver.java (89%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/files/FileHandler.java (88%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/files/InstantUploadBroadcastReceiver.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/files/OwnCloudFileObserver.java (89%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/files/managers/OCNotificationManager.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/files/services/FileDownloader.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/files/services/FileObserverService.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/files/services/FileUploader.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/files/services/OnUploadCompletedListener.java (93%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/location/LocationServiceLauncherReciever.java (91%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/location/LocationUpdateService.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/media/MediaControlView.java (99%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/media/MediaService.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/media/MediaServiceBinder.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/network/AdvancedSslSocketFactory.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/network/AdvancedX509TrustManager.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/network/BearerAuthScheme.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/network/BearerCredentials.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/network/CertificateCombinedException.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/network/OwnCloudClientUtils.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/network/ProgressiveDataTransferer.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/ChunkedUploadFileOperation.java (94%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/CreateFolderOperation.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/DownloadFileOperation.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/ExistenceCheckOperation.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/OAuth2GetAccessToken.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/OnRemoteOperationListener.java (94%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/OperationCancelledException.java (94%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/OwnCloudServerCheckOperation.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/RemoteOperation.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/RemoteOperationResult.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/RemoveFileOperation.java (94%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/RenameFileOperation.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/SynchronizeFileOperation.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/SynchronizeFolderOperation.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/UpdateOCVersionOperation.java (91%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/operations/UploadFileOperation.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/providers/FileContentProvider.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/syncadapter/AbstractOwnCloudSyncAdapter.java (90%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/syncadapter/ContactSyncAdapter.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/syncadapter/ContactSyncService.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/syncadapter/FileSyncAdapter.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/syncadapter/FileSyncService.java (93%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/ActionItem.java (93%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/CustomPopup.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/ExtendedListView.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/QuickAction.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/activity/AccountSelectActivity.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/activity/ConflictsResolveActivity.java (84%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/activity/FailedUploadActivity.java (92%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/activity/FileActivity.java (94%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/activity/FileDisplayActivity.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/activity/GenericExplanationActivity.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/activity/InstantUploadActivity.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/activity/LandingActivity.java (91%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/activity/LogHistoryActivity.java (94%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/activity/PinCodeActivity.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/activity/Preferences.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/activity/PreferencesNewSession.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/activity/TransferServiceGetter.java (84%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/activity/UploadFilesActivity.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/adapter/FileListListAdapter.java (90%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/adapter/LandingScreenAdapter.java (89%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/adapter/LocalFileListAdapter.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/adapter/LogListAdapter.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/dialog/ChangelogDialog.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/dialog/ConflictsResolveDialog.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/dialog/EditNameDialog.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/dialog/IndeterminateProgressDialog.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/dialog/LoadingDialog.java (93%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/dialog/SamlWebViewDialog.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/dialog/SslValidatorDialog.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/dialog/SsoWebView.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/fragment/AuthenticatorAccountDetailsFragment.java (94%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/fragment/AuthenticatorGetStartedFragment.java (94%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/fragment/ConfirmationDialogFragment.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/fragment/ExtendedListFragment.java (94%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/fragment/FileDetailFragment.java (95%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/fragment/FileFragment.java (91%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/fragment/LandingPageFragment.java (85%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/fragment/LocalFileListFragment.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/fragment/OCFileListFragment.java (91%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/preview/FileDownloadFragment.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/preview/PreviewImageActivity.java (94%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/preview/PreviewImageFragment.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/preview/PreviewImagePagerAdapter.java (97%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/preview/PreviewMediaFragment.java (96%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/ui/preview/PreviewVideoActivity.java (93%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/utils/FileStorageUtils.java (93%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/utils/OwnCloudVersion.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/utils/RecursiveFileObserver.java (98%)
 rename src/{com/owncloud => de/mobilcom/debitel/cloud}/android/widgets/ActionEditText.java (98%)
 delete mode 100644 tests/src/com/owncloud/android/test/AccountUtilsTest.java
 create mode 100644 tests/src/de/mobilcom/debitel/cloud/android/test/AccountUtilsTest.java
 rename tests/src/{com/owncloud => de/mobilcom/debitel/cloud}/android/test/FileContentProviderTest.java (81%)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ac8c1506..e059fdf4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,7 +17,7 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
-<manifest package="com.owncloud.android"
+<manifest package="de.mobilcom.debitel.cloud.android"
     android:versionCode="104006"
     android:versionName="1.4.6" xmlns:android="http://schemas.android.com/apk/res/android">
 
diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml
index c987c824..31ec731d 100644
--- a/oc_jb_workaround/AndroidManifest.xml
+++ b/oc_jb_workaround/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.owncloud.android.workaround.accounts"
+    package="de.mobilcom.debitel.cloud.android.workaround.accounts"
     android:versionCode="0100008"
     android:versionName="1.0.8" >
 
diff --git a/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java b/oc_jb_workaround/src/de/mobilcom/debitel/cloud/android/workaround/accounts/AccountAuthenticatorService.java
similarity index 96%
rename from oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java
rename to oc_jb_workaround/src/de/mobilcom/debitel/cloud/android/workaround/accounts/AccountAuthenticatorService.java
index 5a7c57e6..e8e4933b 100644
--- a/oc_jb_workaround/src/com/owncloud/android/workaround/accounts/AccountAuthenticatorService.java
+++ b/oc_jb_workaround/src/de/mobilcom/debitel/cloud/android/workaround/accounts/AccountAuthenticatorService.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.owncloud.android.workaround.accounts;
+package de.mobilcom.debitel.cloud.android.workaround.accounts;
 
 import android.accounts.AbstractAccountAuthenticator;
 import android.accounts.Account;
@@ -63,7 +63,7 @@ public class AccountAuthenticatorService extends Service {
                 String[] requiredFeatures, Bundle options)
                 throws NetworkErrorException {
         	//Log.e("WORKAROUND", "Yes, WORKAROUND takes the control here");
-            final Intent intent = new Intent("com.owncloud.android.workaround.accounts.CREATE");
+            final Intent intent = new Intent("de.mobilcom.debitel.cloud.android.workaround.accounts.CREATE");
             intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE,
                     response);
             intent.putExtra(KEY_AUTH_TOKEN_TYPE, authTokenType);
diff --git a/pom.xml b/pom.xml
index a55a77a1..e13b7ab2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.owncloud.android</groupId>
+    <groupId>de.mobilcom.debitel.cloud.android</groupId>
     <artifactId>owncloud</artifactId>
     <version>1.3.21-SNAPSHOT</version>
     <packaging>apk</packaging>
diff --git a/res/layout/file_preview.xml b/res/layout/file_preview.xml
index 483a3691..12f609fc 100644
--- a/res/layout/file_preview.xml
+++ b/res/layout/file_preview.xml
@@ -54,7 +54,7 @@
 	   	
    	</FrameLayout>
    	
-   	<com.owncloud.android.media.MediaControlView 
+   	<de.mobilcom.debitel.cloud.android.media.MediaControlView 
    	    android:id="@id/media_controller"
    	    android:layout_width="match_parent"
    	    android:layout_height="wrap_content"
diff --git a/res/layout/list_fragment.xml b/res/layout/list_fragment.xml
index 00e6b41f..b34c719a 100644
--- a/res/layout/list_fragment.xml
+++ b/res/layout/list_fragment.xml
@@ -23,7 +23,7 @@
 	android:layout_weight="1"
 	android:orientation="vertical" >
 
-	<com.owncloud.android.ui.ExtendedListView
+	<de.mobilcom.debitel.cloud.android.ui.ExtendedListView
         android:id="@+id/list_root"
         android:layout_width="match_parent"
         android:layout_height="0dip"
diff --git a/res/layout/pincodelock.xml b/res/layout/pincodelock.xml
index b1b6ce82..82b3b94d 100644
--- a/res/layout/pincodelock.xml
+++ b/res/layout/pincodelock.xml
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"
+    xmlns:oc="http://schemas.android.com/apk/res/de.mobilcom.debitel.cloud.android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:gravity="center_horizontal"
diff --git a/res/layout/sso_dialog.xml b/res/layout/sso_dialog.xml
index 788a0e2b..7923e441 100644
--- a/res/layout/sso_dialog.xml
+++ b/res/layout/sso_dialog.xml
@@ -21,7 +21,7 @@
     android:layout_height="wrap_content"
     >
     
-    <com.owncloud.android.ui.dialog.SsoWebView
+    <de.mobilcom.debitel.cloud.android.ui.dialog.SsoWebView
     	android:layout_width="wrap_content"
     	android:layout_height="wrap_content"
         android:id="@+id/sso_webview"
diff --git a/res/layout/upload_files_layout.xml b/res/layout/upload_files_layout.xml
index 6c15ff7e..69e4641f 100644
--- a/res/layout/upload_files_layout.xml
+++ b/res/layout/upload_files_layout.xml
@@ -28,7 +28,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
-        class="com.owncloud.android.ui.fragment.LocalFileListFragment" />
+        class="de.mobilcom.debitel.cloud.android.ui.fragment.LocalFileListFragment" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/res/raw-de/changelog.html b/res/raw-de/changelog.html
index a54a6643..7f6b7464 100644
--- a/res/raw-de/changelog.html
+++ b/res/raw-de/changelog.html
@@ -24,7 +24,7 @@
 		In dieser Version von Android existiert ein Bug, der nach jedem Neustart eine erneute Eingabe der ownCloud Login-Informationen nötig macht. Um das zu umgehen installieren Sie bitte diese kostenlose Hilfs-App: 
 	</p>
 	<p style="text-align:center">
-		<a href="http://play.google.com/store/apps/details?id=com.owncloud.android.workaround.accounts">ownCloud Jelly Bean Workaround</a> 
+		<a href="http://play.google.com/store/apps/details?id=de.mobilcom.debitel.cloud.android.workaround.accounts">ownCloud Jelly Bean Workaround</a> 
 	</p>
 	</body>
 </html>
diff --git a/res/raw-es/changelog.html b/res/raw-es/changelog.html
index 9321d520..0802d390 100644
--- a/res/raw-es/changelog.html
+++ b/res/raw-es/changelog.html
@@ -24,7 +24,7 @@
 		Para prevenir la pérdida de las credenciales de sus cuentas ownCloud en cada reinicio, por favor, instale esta app gratuita que evita el problema en Jelly Bean:	
 	</p>
 	<p style="text-align:center">
-		<a href="http://play.google.com/store/apps/details?id=com.owncloud.android.workaround.accounts">ownCloud Jelly Bean Workaround</a>
+		<a href="http://play.google.com/store/apps/details?id=de.mobilcom.debitel.cloud.android.workaround.accounts">ownCloud Jelly Bean Workaround</a>
 	</p>
 	</body>
 </html>
diff --git a/res/raw/changelog.html b/res/raw/changelog.html
index 754cf6f2..f388f0fc 100644
--- a/res/raw/changelog.html
+++ b/res/raw/changelog.html
@@ -24,7 +24,7 @@
 		To prevent losing your ownCloud account credentials on every reboot, please, install this free helper app to work around the bug in Jelly Bean:
 	</p>
 	<p style="text-align:center">
-		<a href="http://play.google.com/store/apps/details?id=com.owncloud.android.workaround.accounts">ownCloud Jelly Bean Workaround</a> 
+		<a href="http://play.google.com/store/apps/details?id=de.mobilcom.debitel.cloud.android.workaround.accounts">ownCloud Jelly Bean Workaround</a> 
 	</p>
 	</body>
 </html>
diff --git a/res/values/oauth2_configuration.xml b/res/values/oauth2_configuration.xml
index f8e0f51c..c81f54ac 100644
--- a/res/values/oauth2_configuration.xml
+++ b/res/values/oauth2_configuration.xml
@@ -12,7 +12,7 @@
     <string name="oauth2_response_type">code</string>				<!-- depends on oauth2_grant_type -->
     
     <!-- values that should be pre-agreed between app and authorization server, but can be loaded without rebuilding the app -->
-    <string name="oauth2_client_id">com.owncloud.android</string>	<!-- preferable that client decides this -->
+    <string name="oauth2_client_id">de.mobilcom.debitel.cloud.android</string>	<!-- preferable that client decides this -->
     <string name="oauth2_client_secret"></string>					<!-- preferable that client decides this -->
     
 </resources>
diff --git a/res/values/setup.xml b/res/values/setup.xml
index cc816d15..f31e4000 100644
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -35,7 +35,7 @@
     <string name="url_imprint"></string>
     <string name="mail_recommend">"mailto:"</string>
     <string name="mail_feedback">"mailto:apps@owncloud.com"</string>
-    <string name="url_app_download">"https://play.google.com/store/apps/details?id=com.owncloud.android"</string>
+    <string name="url_app_download">"https://play.google.com/store/apps/details?id=de.mobilcom.debitel.cloud.android"</string>
 
 </resources>
 
diff --git a/src/com/owncloud/android/DisplayUtils.java b/src/de/mobilcom/debitel/cloud/android/DisplayUtils.java
similarity index 96%
rename from src/com/owncloud/android/DisplayUtils.java
rename to src/de/mobilcom/debitel/cloud/android/DisplayUtils.java
index 1ee898b3..4b177554 100644
--- a/src/com/owncloud/android/DisplayUtils.java
+++ b/src/de/mobilcom/debitel/cloud/android/DisplayUtils.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android;
+package de.mobilcom.debitel.cloud.android;
 
 import java.util.Arrays;
 import java.util.Date;
diff --git a/src/com/owncloud/android/Log_OC.java b/src/de/mobilcom/debitel/cloud/android/Log_OC.java
similarity index 98%
rename from src/com/owncloud/android/Log_OC.java
rename to src/de/mobilcom/debitel/cloud/android/Log_OC.java
index 5a1be298..48d42779 100644
--- a/src/com/owncloud/android/Log_OC.java
+++ b/src/de/mobilcom/debitel/cloud/android/Log_OC.java
@@ -1,4 +1,4 @@
-package com.owncloud.android;
+package de.mobilcom.debitel.cloud.android;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/src/com/owncloud/android/MainApp.java b/src/de/mobilcom/debitel/cloud/android/MainApp.java
similarity index 98%
rename from src/com/owncloud/android/MainApp.java
rename to src/de/mobilcom/debitel/cloud/android/MainApp.java
index 6cd88fe1..21bf3055 100644
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/de/mobilcom/debitel/cloud/android/MainApp.java
@@ -14,7 +14,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android;
+package de.mobilcom.debitel.cloud.android;
 
 import android.app.Application;
 import android.content.Context;
diff --git a/src/com/owncloud/android/OwnCloudSession.java b/src/de/mobilcom/debitel/cloud/android/OwnCloudSession.java
similarity index 93%
rename from src/com/owncloud/android/OwnCloudSession.java
rename to src/de/mobilcom/debitel/cloud/android/OwnCloudSession.java
index d7bb6094..4e815784 100644
--- a/src/com/owncloud/android/OwnCloudSession.java
+++ b/src/de/mobilcom/debitel/cloud/android/OwnCloudSession.java
@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android;
+package de.mobilcom.debitel.cloud.android;
 
 /**
  * Represents a session to an ownCloud instance
diff --git a/src/com/owncloud/android/Uploader.java b/src/de/mobilcom/debitel/cloud/android/Uploader.java
similarity index 97%
rename from src/com/owncloud/android/Uploader.java
rename to src/de/mobilcom/debitel/cloud/android/Uploader.java
index 7dc64909..0cb3d761 100644
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/de/mobilcom/debitel/cloud/android/Uploader.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android;
+package de.mobilcom.debitel.cloud.android;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -54,13 +54,13 @@ import android.widget.EditText;
 import android.widget.SimpleAdapter;
 import android.widget.Toast;
 
-import com.owncloud.android.authentication.AccountAuthenticator;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.services.FileUploader;
 
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator;
+import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
 
 /**
  * This can be used to upload things to an ownCloud instance.
diff --git a/src/com/owncloud/android/authentication/AccountAuthenticator.java b/src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticator.java
similarity index 96%
rename from src/com/owncloud/android/authentication/AccountAuthenticator.java
rename to src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticator.java
index ff72d73c..1c27e896 100644
--- a/src/com/owncloud/android/authentication/AccountAuthenticator.java
+++ b/src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticator.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.authentication;
+package de.mobilcom.debitel.cloud.android.authentication;
 
 import android.accounts.*;
 import android.content.Context;
@@ -25,10 +25,10 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.widget.Toast;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
 
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.R;
 
 
 /**
@@ -64,15 +64,15 @@ public class AccountAuthenticator extends AbstractAccountAuthenticator {
     /**
      * Value under this key should handle path to webdav php script. Will be
      * removed and usage should be replaced by combining
-     * {@link com.owncloud.android.authentication.AuthenticatorActivity.KEY_OC_BASE_URL} and
-     * {@link com.owncloud.android.utils.OwnCloudVersion}
+     * {@link de.mobilcom.debitel.cloud.android.authentication.AuthenticatorActivity.KEY_OC_BASE_URL} and
+     * {@link de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion}
      * 
      * @deprecated
      */
     public static final String KEY_OC_URL = "oc_url";
     /**
      * Version should be 3 numbers separated by dot so it can be parsed by
-     * {@link com.owncloud.android.utils.OwnCloudVersion}
+     * {@link de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion}
      */
     public static final String KEY_OC_VERSION = "oc_version";
     /**
diff --git a/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java b/src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticatorActivity.java
similarity index 98%
rename from src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java
rename to src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticatorActivity.java
index 62c8825f..9a6c9807 100644
--- a/src/com/owncloud/android/authentication/AccountAuthenticatorActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticatorActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.owncloud.android.authentication;
+package de.mobilcom.debitel.cloud.android.authentication;
 
 import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
diff --git a/src/com/owncloud/android/authentication/AccountAuthenticatorService.java b/src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticatorService.java
similarity index 95%
rename from src/com/owncloud/android/authentication/AccountAuthenticatorService.java
rename to src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticatorService.java
index 4c91f6e4..9f00be13 100644
--- a/src/com/owncloud/android/authentication/AccountAuthenticatorService.java
+++ b/src/de/mobilcom/debitel/cloud/android/authentication/AccountAuthenticatorService.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.authentication;
+package de.mobilcom.debitel.cloud.android.authentication;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/src/com/owncloud/android/authentication/AccountUtils.java b/src/de/mobilcom/debitel/cloud/android/authentication/AccountUtils.java
similarity index 95%
rename from src/com/owncloud/android/authentication/AccountUtils.java
rename to src/de/mobilcom/debitel/cloud/android/authentication/AccountUtils.java
index 3b79c39b..db0ea0d4 100644
--- a/src/com/owncloud/android/authentication/AccountUtils.java
+++ b/src/de/mobilcom/debitel/cloud/android/authentication/AccountUtils.java
@@ -16,10 +16,10 @@
  *
  */
 
-package com.owncloud.android.authentication;
+package de.mobilcom.debitel.cloud.android.authentication;
 
-import com.owncloud.android.MainApp;
-import com.owncloud.android.utils.OwnCloudVersion;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/de/mobilcom/debitel/cloud/android/authentication/AuthenticatorActivity.java
similarity index 95%
rename from src/com/owncloud/android/authentication/AuthenticatorActivity.java
rename to src/de/mobilcom/debitel/cloud/android/authentication/AuthenticatorActivity.java
index 53f18bb4..a7c7f3e0 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/authentication/AuthenticatorActivity.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.authentication;
+package de.mobilcom.debitel.cloud.android.authentication;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -52,22 +52,23 @@ import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
-import com.owncloud.android.R;
-import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;
-import com.owncloud.android.network.OwnCloudClientUtils;
-import com.owncloud.android.operations.ExistenceCheckOperation;
-import com.owncloud.android.operations.OAuth2GetAccessToken;
-import com.owncloud.android.operations.OnRemoteOperationListener;
-import com.owncloud.android.operations.OwnCloudServerCheckOperation;
-import com.owncloud.android.operations.RemoteOperation;
-import com.owncloud.android.operations.RemoteOperationResult;
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.ui.dialog.SamlWebViewDialog;
-import com.owncloud.android.ui.dialog.SslValidatorDialog;
-import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
-import com.owncloud.android.utils.OwnCloudVersion;
+
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;
+import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils;
+import de.mobilcom.debitel.cloud.android.operations.ExistenceCheckOperation;
+import de.mobilcom.debitel.cloud.android.operations.OAuth2GetAccessToken;
+import de.mobilcom.debitel.cloud.android.operations.OnRemoteOperationListener;
+import de.mobilcom.debitel.cloud.android.operations.OwnCloudServerCheckOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
+import de.mobilcom.debitel.cloud.android.ui.dialog.SamlWebViewDialog;
+import de.mobilcom.debitel.cloud.android.ui.dialog.SslValidatorDialog;
+import de.mobilcom.debitel.cloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
+import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion;
 
 import eu.alefzero.webdav.WebdavClient;
 
diff --git a/src/com/owncloud/android/authentication/OAuth2Constants.java b/src/de/mobilcom/debitel/cloud/android/authentication/OAuth2Constants.java
similarity index 97%
rename from src/com/owncloud/android/authentication/OAuth2Constants.java
rename to src/de/mobilcom/debitel/cloud/android/authentication/OAuth2Constants.java
index f96b6278..bf812706 100644
--- a/src/com/owncloud/android/authentication/OAuth2Constants.java
+++ b/src/de/mobilcom/debitel/cloud/android/authentication/OAuth2Constants.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.authentication;
+package de.mobilcom.debitel.cloud.android.authentication;
 
 /** 
  * Constant values for OAuth 2 protocol.
diff --git a/src/com/owncloud/android/authentication/SsoWebViewClient.java b/src/de/mobilcom/debitel/cloud/android/authentication/SsoWebViewClient.java
similarity index 98%
rename from src/com/owncloud/android/authentication/SsoWebViewClient.java
rename to src/de/mobilcom/debitel/cloud/android/authentication/SsoWebViewClient.java
index 4f26a805..550fa6d0 100644
--- a/src/com/owncloud/android/authentication/SsoWebViewClient.java
+++ b/src/de/mobilcom/debitel/cloud/android/authentication/SsoWebViewClient.java
@@ -15,11 +15,11 @@
  *
  */
 
-package com.owncloud.android.authentication;
+package de.mobilcom.debitel.cloud.android.authentication;
 
 import java.lang.ref.WeakReference;
 
-import com.owncloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.Log_OC;
 
 import android.graphics.Bitmap;
 import android.os.Handler;
diff --git a/src/com/owncloud/android/datamodel/DataStorageManager.java b/src/de/mobilcom/debitel/cloud/android/datamodel/DataStorageManager.java
similarity index 96%
rename from src/com/owncloud/android/datamodel/DataStorageManager.java
rename to src/de/mobilcom/debitel/cloud/android/datamodel/DataStorageManager.java
index 133ab8de..bbe06fc9 100644
--- a/src/com/owncloud/android/datamodel/DataStorageManager.java
+++ b/src/de/mobilcom/debitel/cloud/android/datamodel/DataStorageManager.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.datamodel;
+package de.mobilcom.debitel.cloud.android.datamodel;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/de/mobilcom/debitel/cloud/android/datamodel/FileDataStorageManager.java
similarity index 98%
rename from src/com/owncloud/android/datamodel/FileDataStorageManager.java
rename to src/de/mobilcom/debitel/cloud/android/datamodel/FileDataStorageManager.java
index a067f107..32aa09c0 100644
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/de/mobilcom/debitel/cloud/android/datamodel/FileDataStorageManager.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.datamodel;
+package de.mobilcom.debitel.cloud.android.datamodel;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -25,10 +25,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
-import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
-import com.owncloud.android.utils.FileStorageUtils;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.db.ProviderMeta.ProviderTableMeta;
+import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 import android.accounts.Account;
 import android.content.ContentProviderClient;
diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/de/mobilcom/debitel/cloud/android/datamodel/OCFile.java
similarity index 99%
rename from src/com/owncloud/android/datamodel/OCFile.java
rename to src/de/mobilcom/debitel/cloud/android/datamodel/OCFile.java
index 6b8e1785..1865768f 100644
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/de/mobilcom/debitel/cloud/android/datamodel/OCFile.java
@@ -16,11 +16,11 @@
  *
  */
 
-package com.owncloud.android.datamodel;
+package de.mobilcom.debitel.cloud.android.datamodel;
 
 import java.io.File;
 
-import com.owncloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.Log_OC;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/src/com/owncloud/android/db/DbHandler.java b/src/de/mobilcom/debitel/cloud/android/db/DbHandler.java
similarity index 96%
rename from src/com/owncloud/android/db/DbHandler.java
rename to src/de/mobilcom/debitel/cloud/android/db/DbHandler.java
index 8f535629..c04c8014 100644
--- a/src/com/owncloud/android/db/DbHandler.java
+++ b/src/de/mobilcom/debitel/cloud/android/db/DbHandler.java
@@ -15,10 +15,10 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.db;
+package de.mobilcom.debitel.cloud.android.db;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.MainApp;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/com/owncloud/android/db/ProviderMeta.java b/src/de/mobilcom/debitel/cloud/android/db/ProviderMeta.java
similarity index 94%
rename from src/com/owncloud/android/db/ProviderMeta.java
rename to src/de/mobilcom/debitel/cloud/android/db/ProviderMeta.java
index a082a84e..28032c03 100644
--- a/src/com/owncloud/android/db/ProviderMeta.java
+++ b/src/de/mobilcom/debitel/cloud/android/db/ProviderMeta.java
@@ -15,9 +15,9 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.db;
+package de.mobilcom.debitel.cloud.android.db;
 
-import com.owncloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.MainApp;
 
 import android.net.Uri;
 import android.provider.BaseColumns;
diff --git a/src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java b/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableActivity.java
similarity index 95%
rename from src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java
rename to src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableActivity.java
index 7b39931c..e75d39ea 100644
--- a/src/com/owncloud/android/extensions/ExtensionsAvailableActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableActivity.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.extensions;
+package de.mobilcom.debitel.cloud.android.extensions;
 
 import android.os.Bundle;
 import android.support.v4.app.FragmentManager;
diff --git a/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java b/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableDialog.java
similarity index 93%
rename from src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java
rename to src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableDialog.java
index 15db896b..ad4b3b10 100644
--- a/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java
+++ b/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsAvailableDialog.java
@@ -16,10 +16,10 @@
  *
  */
 
-package com.owncloud.android.extensions;
+package de.mobilcom.debitel.cloud.android.extensions;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
diff --git a/src/com/owncloud/android/extensions/ExtensionsListActivity.java b/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsListActivity.java
similarity index 96%
rename from src/com/owncloud/android/extensions/ExtensionsListActivity.java
rename to src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsListActivity.java
index 2f7290e8..040a86cb 100644
--- a/src/com/owncloud/android/extensions/ExtensionsListActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/extensions/ExtensionsListActivity.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.extensions;
+package de.mobilcom.debitel.cloud.android.extensions;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -27,8 +27,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.utils.OwnCloudVersion;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion;
 
 
 import android.R;
diff --git a/src/com/owncloud/android/files/BootupBroadcastReceiver.java b/src/de/mobilcom/debitel/cloud/android/files/BootupBroadcastReceiver.java
similarity index 89%
rename from src/com/owncloud/android/files/BootupBroadcastReceiver.java
rename to src/de/mobilcom/debitel/cloud/android/files/BootupBroadcastReceiver.java
index 8a8c4306..9dc26d83 100644
--- a/src/com/owncloud/android/files/BootupBroadcastReceiver.java
+++ b/src/de/mobilcom/debitel/cloud/android/files/BootupBroadcastReceiver.java
@@ -16,10 +16,10 @@
  *
  */
 
-package com.owncloud.android.files;
+package de.mobilcom.debitel.cloud.android.files;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.files.services.FileObserverService;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.files.services.FileObserverService;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/owncloud/android/files/FileHandler.java b/src/de/mobilcom/debitel/cloud/android/files/FileHandler.java
similarity index 88%
rename from src/com/owncloud/android/files/FileHandler.java
rename to src/de/mobilcom/debitel/cloud/android/files/FileHandler.java
index 2eb754dd..917ffeab 100644
--- a/src/com/owncloud/android/files/FileHandler.java
+++ b/src/de/mobilcom/debitel/cloud/android/files/FileHandler.java
@@ -15,9 +15,9 @@
  *
  */
 
-package com.owncloud.android.files;
+package de.mobilcom.debitel.cloud.android.files;
 
-import com.owncloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
 
 public interface FileHandler {
 
diff --git a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java b/src/de/mobilcom/debitel/cloud/android/files/InstantUploadBroadcastReceiver.java
similarity index 95%
rename from src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
rename to src/de/mobilcom/debitel/cloud/android/files/InstantUploadBroadcastReceiver.java
index 2f753762..3db31aa6 100644
--- a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
+++ b/src/de/mobilcom/debitel/cloud/android/files/InstantUploadBroadcastReceiver.java
@@ -16,13 +16,10 @@
  *
  */
 
-package com.owncloud.android.files;
+package de.mobilcom.debitel.cloud.android.files;
 
 import java.io.File;
 
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.db.DbHandler;
-import com.owncloud.android.files.services.FileUploader;
 
 import android.accounts.Account;
 import android.content.BroadcastReceiver;
@@ -36,9 +33,12 @@ import android.preference.PreferenceManager;
 import android.provider.MediaStore.Images.Media;
 import android.webkit.MimeTypeMap;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
-import com.owncloud.android.utils.FileStorageUtils;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
+import de.mobilcom.debitel.cloud.android.db.DbHandler;
+import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
+import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
 
diff --git a/src/com/owncloud/android/files/OwnCloudFileObserver.java b/src/de/mobilcom/debitel/cloud/android/files/OwnCloudFileObserver.java
similarity index 89%
rename from src/com/owncloud/android/files/OwnCloudFileObserver.java
rename to src/de/mobilcom/debitel/cloud/android/files/OwnCloudFileObserver.java
index 2ea90c9a..79f4c18a 100644
--- a/src/com/owncloud/android/files/OwnCloudFileObserver.java
+++ b/src/de/mobilcom/debitel/cloud/android/files/OwnCloudFileObserver.java
@@ -16,17 +16,17 @@
  *
  */
 
-package com.owncloud.android.files;
+package de.mobilcom.debitel.cloud.android.files;
 
 import java.io.File;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.operations.RemoteOperationResult;
-import com.owncloud.android.operations.SynchronizeFileOperation;
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.ui.activity.ConflictsResolveActivity;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
+import de.mobilcom.debitel.cloud.android.operations.SynchronizeFileOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
+import de.mobilcom.debitel.cloud.android.ui.activity.ConflictsResolveActivity;
 
 
 import android.accounts.Account;
diff --git a/src/com/owncloud/android/files/managers/OCNotificationManager.java b/src/de/mobilcom/debitel/cloud/android/files/managers/OCNotificationManager.java
similarity index 98%
rename from src/com/owncloud/android/files/managers/OCNotificationManager.java
rename to src/de/mobilcom/debitel/cloud/android/files/managers/OCNotificationManager.java
index 55e98ee8..f1f57d22 100644
--- a/src/com/owncloud/android/files/managers/OCNotificationManager.java
+++ b/src/de/mobilcom/debitel/cloud/android/files/managers/OCNotificationManager.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.files.managers;
+package de.mobilcom.debitel.cloud.android.files.managers;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,7 +26,7 @@ import android.app.NotificationManager;
 import android.content.Context;
 import android.widget.RemoteViews;
 
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.R;
 
 public class OCNotificationManager {
 
diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/de/mobilcom/debitel/cloud/android/files/services/FileDownloader.java
similarity index 95%
rename from src/com/owncloud/android/files/services/FileDownloader.java
rename to src/de/mobilcom/debitel/cloud/android/files/services/FileDownloader.java
index 07c4257c..b0040703 100644
--- a/src/com/owncloud/android/files/services/FileDownloader.java
+++ b/src/de/mobilcom/debitel/cloud/android/files/services/FileDownloader.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.files.services;
+package de.mobilcom.debitel.cloud.android.files.services;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,19 +28,8 @@ import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import com.owncloud.android.authentication.AuthenticatorActivity;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 
-import com.owncloud.android.network.OwnCloudClientUtils;
-import com.owncloud.android.operations.DownloadFileOperation;
-import com.owncloud.android.operations.RemoteOperationResult;
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.ui.activity.FileActivity;
-import com.owncloud.android.ui.activity.FileDisplayActivity;
-import com.owncloud.android.ui.preview.PreviewImageActivity;
-import com.owncloud.android.ui.preview.PreviewImageFragment;
 
 import android.accounts.Account;
 import android.accounts.AccountsException;
@@ -58,9 +47,20 @@ import android.os.Message;
 import android.os.Process;
 import android.widget.RemoteViews;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.authentication.AuthenticatorActivity;
+import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils;
+import de.mobilcom.debitel.cloud.android.operations.DownloadFileOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
+import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity;
+import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity;
+import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageActivity;
+import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageFragment;
 import eu.alefzero.webdav.WebdavClient;
 
 public class FileDownloader extends Service implements OnDatatransferProgressListener {
diff --git a/src/com/owncloud/android/files/services/FileObserverService.java b/src/de/mobilcom/debitel/cloud/android/files/services/FileObserverService.java
similarity index 95%
rename from src/com/owncloud/android/files/services/FileObserverService.java
rename to src/de/mobilcom/debitel/cloud/android/files/services/FileObserverService.java
index 8a63a6ee..773faaa6 100644
--- a/src/com/owncloud/android/files/services/FileObserverService.java
+++ b/src/de/mobilcom/debitel/cloud/android/files/services/FileObserverService.java
@@ -16,19 +16,19 @@
  *
  */
 
-package com.owncloud.android.files.services;
+package de.mobilcom.debitel.cloud.android.files.services;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
-import com.owncloud.android.files.OwnCloudFileObserver;
-import com.owncloud.android.operations.SynchronizeFileOperation;
-import com.owncloud.android.utils.FileStorageUtils;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.db.ProviderMeta.ProviderTableMeta;
+import de.mobilcom.debitel.cloud.android.files.OwnCloudFileObserver;
+import de.mobilcom.debitel.cloud.android.operations.SynchronizeFileOperation;
+import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/de/mobilcom/debitel/cloud/android/files/services/FileUploader.java
similarity index 96%
rename from src/com/owncloud/android/files/services/FileUploader.java
rename to src/de/mobilcom/debitel/cloud/android/files/services/FileUploader.java
index e738a276..26f29ba4 100644
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/de/mobilcom/debitel/cloud/android/files/services/FileUploader.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.files.services;
+package de.mobilcom.debitel.cloud.android.files.services;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,24 +33,11 @@ import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
-import com.owncloud.android.authentication.AccountAuthenticator;
-import com.owncloud.android.authentication.AuthenticatorActivity;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.operations.ChunkedUploadFileOperation;
-import com.owncloud.android.operations.CreateFolderOperation;
-import com.owncloud.android.operations.ExistenceCheckOperation;
-import com.owncloud.android.operations.RemoteOperation;
-import com.owncloud.android.operations.RemoteOperationResult;
-import com.owncloud.android.operations.UploadFileOperation;
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.utils.OwnCloudVersion;
 
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 import eu.alefzero.webdav.WebdavEntry;
 import eu.alefzero.webdav.WebdavUtils;
 
-import com.owncloud.android.network.OwnCloudClientUtils;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -70,16 +57,29 @@ import android.os.Process;
 import android.webkit.MimeTypeMap;
 import android.widget.RemoteViews;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
-import com.owncloud.android.R;
-import com.owncloud.android.db.DbHandler;
-import com.owncloud.android.ui.activity.FailedUploadActivity;
-import com.owncloud.android.ui.activity.FileActivity;
-import com.owncloud.android.ui.activity.FileDisplayActivity;
-import com.owncloud.android.ui.activity.InstantUploadActivity;
-import com.owncloud.android.ui.preview.PreviewImageActivity;
-import com.owncloud.android.ui.preview.PreviewImageFragment;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator;
+import de.mobilcom.debitel.cloud.android.authentication.AuthenticatorActivity;
+import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.db.DbHandler;
+import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils;
+import de.mobilcom.debitel.cloud.android.operations.ChunkedUploadFileOperation;
+import de.mobilcom.debitel.cloud.android.operations.CreateFolderOperation;
+import de.mobilcom.debitel.cloud.android.operations.ExistenceCheckOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
+import de.mobilcom.debitel.cloud.android.operations.UploadFileOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
+import de.mobilcom.debitel.cloud.android.ui.activity.FailedUploadActivity;
+import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity;
+import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity;
+import de.mobilcom.debitel.cloud.android.ui.activity.InstantUploadActivity;
+import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageActivity;
+import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageFragment;
+import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion;
 
 import eu.alefzero.webdav.WebdavClient;
 
diff --git a/src/com/owncloud/android/files/services/OnUploadCompletedListener.java b/src/de/mobilcom/debitel/cloud/android/files/services/OnUploadCompletedListener.java
similarity index 93%
rename from src/com/owncloud/android/files/services/OnUploadCompletedListener.java
rename to src/de/mobilcom/debitel/cloud/android/files/services/OnUploadCompletedListener.java
index b6ee1aca..7f8039e0 100644
--- a/src/com/owncloud/android/files/services/OnUploadCompletedListener.java
+++ b/src/de/mobilcom/debitel/cloud/android/files/services/OnUploadCompletedListener.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.files.services;
+package de.mobilcom.debitel.cloud.android.files.services;
 
 public interface OnUploadCompletedListener extends Runnable {
 
diff --git a/src/com/owncloud/android/location/LocationServiceLauncherReciever.java b/src/de/mobilcom/debitel/cloud/android/location/LocationServiceLauncherReciever.java
similarity index 91%
rename from src/com/owncloud/android/location/LocationServiceLauncherReciever.java
rename to src/de/mobilcom/debitel/cloud/android/location/LocationServiceLauncherReciever.java
index a974c565..0c77a25a 100644
--- a/src/com/owncloud/android/location/LocationServiceLauncherReciever.java
+++ b/src/de/mobilcom/debitel/cloud/android/location/LocationServiceLauncherReciever.java
@@ -15,9 +15,9 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.location;
+package de.mobilcom.debitel.cloud.android.location;
 
-import com.owncloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.Log_OC;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
@@ -35,7 +35,7 @@ public class LocationServiceLauncherReciever extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         Intent deviceTrackingIntent = new Intent();
         deviceTrackingIntent
-                .setAction("com.owncloud.android.location.LocationUpdateService");
+                .setAction("de.mobilcom.debitel.cloud.android.location.LocationUpdateService");
         SharedPreferences preferences = PreferenceManager
                 .getDefaultSharedPreferences(context);
         boolean trackDevice = preferences.getBoolean("enable_devicetracking",
@@ -58,7 +58,7 @@ public class LocationServiceLauncherReciever extends BroadcastReceiver {
     private void startOrStopDeviceTracking(Context context, boolean trackDevice) {
         Intent deviceTrackingIntent = new Intent();
         deviceTrackingIntent
-                .setAction("com.owncloud.android.location.LocationUpdateService");
+                .setAction("de.mobilcom.debitel.cloud.android.location.LocationUpdateService");
         if (!isDeviceTrackingServiceRunning(context) && trackDevice) {
             Log_OC.d(TAG, "Starting device tracker service");
             context.startService(deviceTrackingIntent);
diff --git a/src/com/owncloud/android/location/LocationUpdateService.java b/src/de/mobilcom/debitel/cloud/android/location/LocationUpdateService.java
similarity index 96%
rename from src/com/owncloud/android/location/LocationUpdateService.java
rename to src/de/mobilcom/debitel/cloud/android/location/LocationUpdateService.java
index 7fe2ee9f..dccfe7fe 100644
--- a/src/com/owncloud/android/location/LocationUpdateService.java
+++ b/src/de/mobilcom/debitel/cloud/android/location/LocationUpdateService.java
@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.location;
+package de.mobilcom.debitel.cloud.android.location;
 
 import android.app.IntentService;
 import android.content.Intent;
@@ -29,8 +29,8 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.widget.Toast;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
 
 public class LocationUpdateService extends IntentService implements
         LocationListener {
diff --git a/src/com/owncloud/android/media/MediaControlView.java b/src/de/mobilcom/debitel/cloud/android/media/MediaControlView.java
similarity index 99%
rename from src/com/owncloud/android/media/MediaControlView.java
rename to src/de/mobilcom/debitel/cloud/android/media/MediaControlView.java
index 8047f02e..5e24907a 100644
--- a/src/com/owncloud/android/media/MediaControlView.java
+++ b/src/de/mobilcom/debitel/cloud/android/media/MediaControlView.java
@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.media;
+package de.mobilcom.debitel.cloud.android.media;
 
 import android.content.Context;
 import android.media.MediaPlayer;
@@ -40,7 +40,7 @@ import android.widget.TextView;
 import java.util.Formatter;
 import java.util.Locale;
 
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.R;
 
 /**
  * View containing controls for a {@link MediaPlayer}. 
diff --git a/src/com/owncloud/android/media/MediaService.java b/src/de/mobilcom/debitel/cloud/android/media/MediaService.java
similarity index 98%
rename from src/com/owncloud/android/media/MediaService.java
rename to src/de/mobilcom/debitel/cloud/android/media/MediaService.java
index 992bc7dd..a5094cec 100644
--- a/src/com/owncloud/android/media/MediaService.java
+++ b/src/de/mobilcom/debitel/cloud/android/media/MediaService.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.media;
+package de.mobilcom.debitel.cloud.android.media;
 
 import android.accounts.Account;
 import android.app.Notification;
@@ -37,11 +37,11 @@ import android.widget.Toast;
 
 import java.io.IOException;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.ui.activity.FileActivity;
-import com.owncloud.android.ui.activity.FileDisplayActivity;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity;
+import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity;
 
 /**
  * Service that handles media playback, both audio and video. 
@@ -56,7 +56,7 @@ public class MediaService extends Service implements OnCompletionListener, OnPre
 
     private static final String TAG = MediaService.class.getSimpleName();
 
-    private static final String MY_PACKAGE = MediaService.class.getPackage() != null ? MediaService.class.getPackage().getName() : "com.owncloud.android.media";
+    private static final String MY_PACKAGE = MediaService.class.getPackage() != null ? MediaService.class.getPackage().getName() : "de.mobilcom.debitel.cloud.android.media";
     
     /// Intent actions that we are prepared to handle
     public static final String ACTION_PLAY_FILE = MY_PACKAGE + ".action.PLAY_FILE";
diff --git a/src/com/owncloud/android/media/MediaServiceBinder.java b/src/de/mobilcom/debitel/cloud/android/media/MediaServiceBinder.java
similarity index 96%
rename from src/com/owncloud/android/media/MediaServiceBinder.java
rename to src/de/mobilcom/debitel/cloud/android/media/MediaServiceBinder.java
index 4fab8bdf..935d3e20 100644
--- a/src/com/owncloud/android/media/MediaServiceBinder.java
+++ b/src/de/mobilcom/debitel/cloud/android/media/MediaServiceBinder.java
@@ -15,12 +15,12 @@
  *
  */
 
-package com.owncloud.android.media;
+package de.mobilcom.debitel.cloud.android.media;
 
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.media.MediaService.State;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.media.MediaService.State;
 
 import android.accounts.Account;
 import android.content.Intent;
diff --git a/src/com/owncloud/android/network/AdvancedSslSocketFactory.java b/src/de/mobilcom/debitel/cloud/android/network/AdvancedSslSocketFactory.java
similarity index 98%
rename from src/com/owncloud/android/network/AdvancedSslSocketFactory.java
rename to src/de/mobilcom/debitel/cloud/android/network/AdvancedSslSocketFactory.java
index da9a0ffc..cf802ceb 100644
--- a/src/com/owncloud/android/network/AdvancedSslSocketFactory.java
+++ b/src/de/mobilcom/debitel/cloud/android/network/AdvancedSslSocketFactory.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.network;
+package de.mobilcom.debitel.cloud.android.network;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -39,7 +39,7 @@ import org.apache.commons.httpclient.params.HttpConnectionParams;
 import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
 import org.apache.http.conn.ssl.X509HostnameVerifier;
 
-import com.owncloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.Log_OC;
 
 /**
  * AdvancedSSLProtocolSocketFactory allows to create SSL {@link Socket}s with 
diff --git a/src/com/owncloud/android/network/AdvancedX509TrustManager.java b/src/de/mobilcom/debitel/cloud/android/network/AdvancedX509TrustManager.java
similarity index 98%
rename from src/com/owncloud/android/network/AdvancedX509TrustManager.java
rename to src/de/mobilcom/debitel/cloud/android/network/AdvancedX509TrustManager.java
index ad4feb37..038ca392 100644
--- a/src/com/owncloud/android/network/AdvancedX509TrustManager.java
+++ b/src/de/mobilcom/debitel/cloud/android/network/AdvancedX509TrustManager.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.network;
+package de.mobilcom.debitel.cloud.android.network;
 
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -31,7 +31,7 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
-import com.owncloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.Log_OC;
 
 /**
  * @author David A. Velasco
diff --git a/src/com/owncloud/android/network/BearerAuthScheme.java b/src/de/mobilcom/debitel/cloud/android/network/BearerAuthScheme.java
similarity index 98%
rename from src/com/owncloud/android/network/BearerAuthScheme.java
rename to src/de/mobilcom/debitel/cloud/android/network/BearerAuthScheme.java
index a4267340..3d4abc08 100644
--- a/src/com/owncloud/android/network/BearerAuthScheme.java
+++ b/src/de/mobilcom/debitel/cloud/android/network/BearerAuthScheme.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.network;
+package de.mobilcom.debitel.cloud.android.network;
 
 import java.util.Map;
 
@@ -27,7 +27,7 @@ import org.apache.commons.httpclient.auth.AuthenticationException;
 import org.apache.commons.httpclient.auth.InvalidCredentialsException;
 import org.apache.commons.httpclient.auth.MalformedChallengeException;
 
-import com.owncloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.Log_OC;
 
 /**
  * Bearer authentication scheme as defined in RFC 6750.
diff --git a/src/com/owncloud/android/network/BearerCredentials.java b/src/de/mobilcom/debitel/cloud/android/network/BearerCredentials.java
similarity index 97%
rename from src/com/owncloud/android/network/BearerCredentials.java
rename to src/de/mobilcom/debitel/cloud/android/network/BearerCredentials.java
index 50799b02..12e62e9c 100644
--- a/src/com/owncloud/android/network/BearerCredentials.java
+++ b/src/de/mobilcom/debitel/cloud/android/network/BearerCredentials.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.network;
+package de.mobilcom.debitel.cloud.android.network;
 
 import org.apache.commons.httpclient.Credentials;
 import org.apache.commons.httpclient.util.LangUtils;
diff --git a/src/com/owncloud/android/network/CertificateCombinedException.java b/src/de/mobilcom/debitel/cloud/android/network/CertificateCombinedException.java
similarity index 98%
rename from src/com/owncloud/android/network/CertificateCombinedException.java
rename to src/de/mobilcom/debitel/cloud/android/network/CertificateCombinedException.java
index e96d9dc6..d767ea07 100644
--- a/src/com/owncloud/android/network/CertificateCombinedException.java
+++ b/src/de/mobilcom/debitel/cloud/android/network/CertificateCombinedException.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.network;
+package de.mobilcom.debitel.cloud.android.network;
 
 import java.security.cert.CertPathValidatorException;
 import java.security.cert.CertificateException;
diff --git a/src/com/owncloud/android/network/OwnCloudClientUtils.java b/src/de/mobilcom/debitel/cloud/android/network/OwnCloudClientUtils.java
similarity index 97%
rename from src/com/owncloud/android/network/OwnCloudClientUtils.java
rename to src/de/mobilcom/debitel/cloud/android/network/OwnCloudClientUtils.java
index 43104d08..767d9bb2 100644
--- a/src/com/owncloud/android/network/OwnCloudClientUtils.java
+++ b/src/de/mobilcom/debitel/cloud/android/network/OwnCloudClientUtils.java
@@ -14,7 +14,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.network;
+package de.mobilcom.debitel.cloud.android.network;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -36,11 +36,11 @@ import org.apache.commons.httpclient.protocol.Protocol;
 import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
 import org.apache.http.conn.ssl.X509HostnameVerifier;
 
-import com.owncloud.android.authentication.AccountAuthenticator;
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils.AccountNotFoundException;
 
 import eu.alefzero.webdav.WebdavClient;
 
diff --git a/src/com/owncloud/android/network/ProgressiveDataTransferer.java b/src/de/mobilcom/debitel/cloud/android/network/ProgressiveDataTransferer.java
similarity index 95%
rename from src/com/owncloud/android/network/ProgressiveDataTransferer.java
rename to src/de/mobilcom/debitel/cloud/android/network/ProgressiveDataTransferer.java
index c6fa545b..f066c8a9 100644
--- a/src/com/owncloud/android/network/ProgressiveDataTransferer.java
+++ b/src/de/mobilcom/debitel/cloud/android/network/ProgressiveDataTransferer.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.network;
+package de.mobilcom.debitel.cloud.android.network;
 
 import java.util.Collection;
 
diff --git a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java b/src/de/mobilcom/debitel/cloud/android/operations/ChunkedUploadFileOperation.java
similarity index 94%
rename from src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
rename to src/de/mobilcom/debitel/cloud/android/operations/ChunkedUploadFileOperation.java
index 02e1ad04..3c307246 100644
--- a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/ChunkedUploadFileOperation.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,9 +27,9 @@ import java.util.Random;
 import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.methods.PutMethod;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.network.ProgressiveDataTransferer;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.network.ProgressiveDataTransferer;
 
 import android.accounts.Account;
 
diff --git a/src/com/owncloud/android/operations/CreateFolderOperation.java b/src/de/mobilcom/debitel/cloud/android/operations/CreateFolderOperation.java
similarity index 95%
rename from src/com/owncloud/android/operations/CreateFolderOperation.java
rename to src/de/mobilcom/debitel/cloud/android/operations/CreateFolderOperation.java
index 5745ec21..f9bc65ce 100644
--- a/src/com/owncloud/android/operations/CreateFolderOperation.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/CreateFolderOperation.java
@@ -15,16 +15,16 @@
  *
  */
 
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 import java.io.File;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.client.methods.MkColMethod;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
 
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;
diff --git a/src/com/owncloud/android/operations/DownloadFileOperation.java b/src/de/mobilcom/debitel/cloud/android/operations/DownloadFileOperation.java
similarity index 95%
rename from src/com/owncloud/android/operations/DownloadFileOperation.java
rename to src/de/mobilcom/debitel/cloud/android/operations/DownloadFileOperation.java
index 02098b81..7fcb52f9 100644
--- a/src/com/owncloud/android/operations/DownloadFileOperation.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/DownloadFileOperation.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -32,11 +32,11 @@ import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.http.HttpStatus;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.operations.RemoteOperation;
-import com.owncloud.android.operations.RemoteOperationResult;
-import com.owncloud.android.utils.FileStorageUtils;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
+import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 import eu.alefzero.webdav.WebdavClient;
diff --git a/src/com/owncloud/android/operations/ExistenceCheckOperation.java b/src/de/mobilcom/debitel/cloud/android/operations/ExistenceCheckOperation.java
similarity index 97%
rename from src/com/owncloud/android/operations/ExistenceCheckOperation.java
rename to src/de/mobilcom/debitel/cloud/android/operations/ExistenceCheckOperation.java
index 136fe224..b7088b03 100644
--- a/src/com/owncloud/android/operations/ExistenceCheckOperation.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/ExistenceCheckOperation.java
@@ -15,12 +15,12 @@
  *
  */
 
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.HeadMethod;
 
-import com.owncloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.Log_OC;
 
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;
diff --git a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java b/src/de/mobilcom/debitel/cloud/android/operations/OAuth2GetAccessToken.java
similarity index 96%
rename from src/com/owncloud/android/operations/OAuth2GetAccessToken.java
rename to src/de/mobilcom/debitel/cloud/android/operations/OAuth2GetAccessToken.java
index 5d468041..632efd83 100644
--- a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/OAuth2GetAccessToken.java
@@ -1,4 +1,4 @@
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -8,9 +8,9 @@ import org.apache.commons.httpclient.NameValuePair;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.authentication.OAuth2Constants;
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.authentication.OAuth2Constants;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
 
 import eu.alefzero.webdav.WebdavClient;
 
diff --git a/src/com/owncloud/android/operations/OnRemoteOperationListener.java b/src/de/mobilcom/debitel/cloud/android/operations/OnRemoteOperationListener.java
similarity index 94%
rename from src/com/owncloud/android/operations/OnRemoteOperationListener.java
rename to src/de/mobilcom/debitel/cloud/android/operations/OnRemoteOperationListener.java
index e6a58e73..3bd183eb 100644
--- a/src/com/owncloud/android/operations/OnRemoteOperationListener.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/OnRemoteOperationListener.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 public interface OnRemoteOperationListener {
 
diff --git a/src/com/owncloud/android/operations/OperationCancelledException.java b/src/de/mobilcom/debitel/cloud/android/operations/OperationCancelledException.java
similarity index 94%
rename from src/com/owncloud/android/operations/OperationCancelledException.java
rename to src/de/mobilcom/debitel/cloud/android/operations/OperationCancelledException.java
index 0b7878ce..8db7ee85 100644
--- a/src/com/owncloud/android/operations/OperationCancelledException.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/OperationCancelledException.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 public class OperationCancelledException extends Exception {
 
diff --git a/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java b/src/de/mobilcom/debitel/cloud/android/operations/OwnCloudServerCheckOperation.java
similarity index 95%
rename from src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java
rename to src/de/mobilcom/debitel/cloud/android/operations/OwnCloudServerCheckOperation.java
index d95b3055..fbf097f8 100644
--- a/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/OwnCloudServerCheckOperation.java
@@ -15,16 +15,16 @@
  *
  */
 
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.utils.OwnCloudVersion;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
+import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion;
 
 import eu.alefzero.webdav.WebdavClient;
 import android.content.Context;
diff --git a/src/com/owncloud/android/operations/RemoteOperation.java b/src/de/mobilcom/debitel/cloud/android/operations/RemoteOperation.java
similarity index 97%
rename from src/com/owncloud/android/operations/RemoteOperation.java
rename to src/de/mobilcom/debitel/cloud/android/operations/RemoteOperation.java
index 191bde0a..19bbfb28 100644
--- a/src/com/owncloud/android/operations/RemoteOperation.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/RemoteOperation.java
@@ -14,17 +14,17 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 import java.io.IOException;
 
 import org.apache.commons.httpclient.Credentials;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
-import com.owncloud.android.network.BearerCredentials;
-import com.owncloud.android.network.OwnCloudClientUtils;
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.network.BearerCredentials;
+import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
diff --git a/src/com/owncloud/android/operations/RemoteOperationResult.java b/src/de/mobilcom/debitel/cloud/android/operations/RemoteOperationResult.java
similarity index 97%
rename from src/com/owncloud/android/operations/RemoteOperationResult.java
rename to src/de/mobilcom/debitel/cloud/android/operations/RemoteOperationResult.java
index 4e137c42..c5b7dbab 100644
--- a/src/com/owncloud/android/operations/RemoteOperationResult.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/RemoteOperationResult.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -36,9 +36,9 @@ import org.apache.jackrabbit.webdav.DavException;
 import android.accounts.Account;
 import android.accounts.AccountsException;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
-import com.owncloud.android.network.CertificateCombinedException;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils.AccountNotFoundException;
+import de.mobilcom.debitel.cloud.android.network.CertificateCombinedException;
 
 /**
  * The result of a remote operation required to an ownCloud server.
diff --git a/src/com/owncloud/android/operations/RemoveFileOperation.java b/src/de/mobilcom/debitel/cloud/android/operations/RemoveFileOperation.java
similarity index 94%
rename from src/com/owncloud/android/operations/RemoveFileOperation.java
rename to src/de/mobilcom/debitel/cloud/android/operations/RemoveFileOperation.java
index 9dabfafd..03c4cb88 100644
--- a/src/com/owncloud/android/operations/RemoveFileOperation.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/RemoveFileOperation.java
@@ -15,14 +15,14 @@
  *
  */
 
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
 
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;
diff --git a/src/com/owncloud/android/operations/RenameFileOperation.java b/src/de/mobilcom/debitel/cloud/android/operations/RenameFileOperation.java
similarity index 96%
rename from src/com/owncloud/android/operations/RenameFileOperation.java
rename to src/de/mobilcom/debitel/cloud/android/operations/RenameFileOperation.java
index fddb8499..60e1b035 100644
--- a/src/com/owncloud/android/operations/RenameFileOperation.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/RenameFileOperation.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,11 +25,11 @@ import org.apache.jackrabbit.webdav.client.methods.DavMethodBase;
 
 import android.accounts.Account;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.utils.FileStorageUtils;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
+import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;
diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/de/mobilcom/debitel/cloud/android/operations/SynchronizeFileOperation.java
similarity index 95%
rename from src/com/owncloud/android/operations/SynchronizeFileOperation.java
rename to src/de/mobilcom/debitel/cloud/android/operations/SynchronizeFileOperation.java
index 7a81b84e..bd5637ea 100644
--- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/SynchronizeFileOperation.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 import org.apache.http.HttpStatus;
 import org.apache.jackrabbit.webdav.DavConstants;
@@ -27,12 +27,12 @@ import android.accounts.Account;
 import android.content.Context;
 import android.content.Intent;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.services.FileDownloader;
-import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.files.services.FileDownloader;
+import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
 
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavEntry;
diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/de/mobilcom/debitel/cloud/android/operations/SynchronizeFolderOperation.java
similarity index 97%
rename from src/com/owncloud/android/operations/SynchronizeFolderOperation.java
rename to src/de/mobilcom/debitel/cloud/android/operations/SynchronizeFolderOperation.java
index 32956682..d089f381 100644
--- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/SynchronizeFolderOperation.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -36,11 +36,11 @@ import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 import android.accounts.Account;
 import android.content.Context;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.utils.FileStorageUtils;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
+import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavEntry;
diff --git a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java b/src/de/mobilcom/debitel/cloud/android/operations/UpdateOCVersionOperation.java
similarity index 91%
rename from src/com/owncloud/android/operations/UpdateOCVersionOperation.java
rename to src/de/mobilcom/debitel/cloud/android/operations/UpdateOCVersionOperation.java
index 1643377b..fdf7fcab 100644
--- a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/UpdateOCVersionOperation.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.GetMethod;
@@ -26,11 +26,11 @@ import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.Context;
 
-import com.owncloud.android.authentication.AccountAuthenticator;
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.utils.OwnCloudVersion;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
+import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion;
 
 import eu.alefzero.webdav.WebdavClient;
 
diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/de/mobilcom/debitel/cloud/android/operations/UploadFileOperation.java
similarity index 96%
rename from src/com/owncloud/android/operations/UploadFileOperation.java
rename to src/de/mobilcom/debitel/cloud/android/operations/UploadFileOperation.java
index cae1f179..5a5a1e48 100644
--- a/src/com/owncloud/android/operations/UploadFileOperation.java
+++ b/src/de/mobilcom/debitel/cloud/android/operations/UploadFileOperation.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.operations;
+package de.mobilcom.debitel.cloud.android.operations;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -32,16 +32,16 @@ import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.methods.RequestEntity;
 import org.apache.http.HttpStatus;
 
-import com.owncloud.android.Log_OC;
 import android.accounts.Account;
 
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.network.ProgressiveDataTransferer;
-import com.owncloud.android.operations.RemoteOperation;
-import com.owncloud.android.operations.RemoteOperationResult;
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.utils.FileStorageUtils;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
+import de.mobilcom.debitel.cloud.android.network.ProgressiveDataTransferer;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
+import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 import eu.alefzero.webdav.FileRequestEntity;
 import eu.alefzero.webdav.OnDatatransferProgressListener;
diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/de/mobilcom/debitel/cloud/android/providers/FileContentProvider.java
similarity index 97%
rename from src/com/owncloud/android/providers/FileContentProvider.java
rename to src/de/mobilcom/debitel/cloud/android/providers/FileContentProvider.java
index b933be4d..af31e668 100644
--- a/src/com/owncloud/android/providers/FileContentProvider.java
+++ b/src/de/mobilcom/debitel/cloud/android/providers/FileContentProvider.java
@@ -16,14 +16,14 @@
  *
  */
 
-package com.owncloud.android.providers;
+package de.mobilcom.debitel.cloud.android.providers;
 
 import java.util.HashMap;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
-import com.owncloud.android.db.ProviderMeta;
-import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.db.ProviderMeta;
+import de.mobilcom.debitel.cloud.android.db.ProviderMeta.ProviderTableMeta;
 
 
 import android.content.ContentProvider;
diff --git a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/de/mobilcom/debitel/cloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
similarity index 90%
rename from src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
rename to src/de/mobilcom/debitel/cloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
index 72414028..1d4d4fbb 100644
--- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/de/mobilcom/debitel/cloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.syncadapter;
+package de.mobilcom.debitel.cloud.android.syncadapter;
 
 import java.io.IOException;
 import java.util.Date;
@@ -27,10 +27,10 @@ import org.apache.http.client.ClientProtocolException;
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
 import org.apache.http.protocol.HttpContext;
 
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.network.OwnCloudClientUtils;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils.AccountNotFoundException;
+import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
+import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
diff --git a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java b/src/de/mobilcom/debitel/cloud/android/syncadapter/ContactSyncAdapter.java
similarity index 95%
rename from src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
rename to src/de/mobilcom/debitel/cloud/android/syncadapter/ContactSyncAdapter.java
index f65e28c2..ff2e84ad 100644
--- a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
+++ b/src/de/mobilcom/debitel/cloud/android/syncadapter/ContactSyncAdapter.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.syncadapter;
+package de.mobilcom.debitel.cloud.android.syncadapter;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -24,8 +24,8 @@ import java.io.IOException;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.ByteArrayEntity;
 
-import com.owncloud.android.authentication.AccountAuthenticator;
-import com.owncloud.android.authentication.AccountUtils;
+import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
diff --git a/src/com/owncloud/android/syncadapter/ContactSyncService.java b/src/de/mobilcom/debitel/cloud/android/syncadapter/ContactSyncService.java
similarity index 96%
rename from src/com/owncloud/android/syncadapter/ContactSyncService.java
rename to src/de/mobilcom/debitel/cloud/android/syncadapter/ContactSyncService.java
index 6d7c46c0..9d15ca5b 100644
--- a/src/com/owncloud/android/syncadapter/ContactSyncService.java
+++ b/src/de/mobilcom/debitel/cloud/android/syncadapter/ContactSyncService.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.syncadapter;
+package de.mobilcom.debitel.cloud.android.syncadapter;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/de/mobilcom/debitel/cloud/android/syncadapter/FileSyncAdapter.java
similarity index 95%
rename from src/com/owncloud/android/syncadapter/FileSyncAdapter.java
rename to src/de/mobilcom/debitel/cloud/android/syncadapter/FileSyncAdapter.java
index 0d4e4c5a..e073971e 100644
--- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/de/mobilcom/debitel/cloud/android/syncadapter/FileSyncAdapter.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.syncadapter;
+package de.mobilcom.debitel.cloud.android.syncadapter;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -26,18 +26,18 @@ import java.util.Map;
 
 import org.apache.jackrabbit.webdav.DavException;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
-import com.owncloud.android.R;
-import com.owncloud.android.authentication.AuthenticatorActivity;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.operations.RemoteOperationResult;
-import com.owncloud.android.operations.SynchronizeFolderOperation;
-import com.owncloud.android.operations.UpdateOCVersionOperation;
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.authentication.AuthenticatorActivity;
+import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
+import de.mobilcom.debitel.cloud.android.operations.SynchronizeFolderOperation;
+import de.mobilcom.debitel.cloud.android.operations.UpdateOCVersionOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
+import de.mobilcom.debitel.cloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;
 
 import android.accounts.Account;
 import android.accounts.AccountsException;
diff --git a/src/com/owncloud/android/syncadapter/FileSyncService.java b/src/de/mobilcom/debitel/cloud/android/syncadapter/FileSyncService.java
similarity index 93%
rename from src/com/owncloud/android/syncadapter/FileSyncService.java
rename to src/de/mobilcom/debitel/cloud/android/syncadapter/FileSyncService.java
index d3472658..de0f4598 100644
--- a/src/com/owncloud/android/syncadapter/FileSyncService.java
+++ b/src/de/mobilcom/debitel/cloud/android/syncadapter/FileSyncService.java
@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.syncadapter;
+package de.mobilcom.debitel.cloud.android.syncadapter;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/src/com/owncloud/android/ui/ActionItem.java b/src/de/mobilcom/debitel/cloud/android/ui/ActionItem.java
similarity index 93%
rename from src/com/owncloud/android/ui/ActionItem.java
rename to src/de/mobilcom/debitel/cloud/android/ui/ActionItem.java
index a65f3ad0..6b907678 100644
--- a/src/com/owncloud/android/ui/ActionItem.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/ActionItem.java
@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui;
+package de.mobilcom.debitel.cloud.android.ui;
 
 import android.graphics.drawable.Drawable;
 import android.view.View.OnClickListener;
diff --git a/src/com/owncloud/android/ui/CustomPopup.java b/src/de/mobilcom/debitel/cloud/android/ui/CustomPopup.java
similarity index 95%
rename from src/com/owncloud/android/ui/CustomPopup.java
rename to src/de/mobilcom/debitel/cloud/android/ui/CustomPopup.java
index fccf56d2..244a1935 100644
--- a/src/com/owncloud/android/ui/CustomPopup.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/CustomPopup.java
@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui;
+package de.mobilcom.debitel.cloud.android.ui;
 
 import android.content.Context;
 import android.graphics.Rect;
diff --git a/src/com/owncloud/android/ui/ExtendedListView.java b/src/de/mobilcom/debitel/cloud/android/ui/ExtendedListView.java
similarity index 98%
rename from src/com/owncloud/android/ui/ExtendedListView.java
rename to src/de/mobilcom/debitel/cloud/android/ui/ExtendedListView.java
index 9fe885bf..15a797fe 100644
--- a/src/com/owncloud/android/ui/ExtendedListView.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/ExtendedListView.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.ui;
+package de.mobilcom.debitel.cloud.android.ui;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/src/com/owncloud/android/ui/QuickAction.java b/src/de/mobilcom/debitel/cloud/android/ui/QuickAction.java
similarity index 96%
rename from src/com/owncloud/android/ui/QuickAction.java
rename to src/de/mobilcom/debitel/cloud/android/ui/QuickAction.java
index 8ae71ec4..52408390 100644
--- a/src/com/owncloud/android/ui/QuickAction.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/QuickAction.java
@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui;
+package de.mobilcom.debitel.cloud.android.ui;
 
 import android.content.Context;
 
@@ -36,7 +36,7 @@ import android.view.ViewGroup;
 
 import java.util.ArrayList;
 
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.R;
 
 /**
  * Popup window, shows action list as icon and text like the one in Gallery3D
diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/AccountSelectActivity.java
similarity index 96%
rename from src/com/owncloud/android/ui/activity/AccountSelectActivity.java
rename to src/de/mobilcom/debitel/cloud/android/ui/activity/AccountSelectActivity.java
index 1b73c86e..852f8101 100644
--- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/AccountSelectActivity.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.ui.activity;
+package de.mobilcom.debitel.cloud.android.ui.activity;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -47,13 +47,13 @@ import com.actionbarsherlock.app.SherlockListActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import com.owncloud.android.authentication.AccountAuthenticator;
-import com.owncloud.android.authentication.AuthenticatorActivity;
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
 
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.authentication.AccountAuthenticator;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
+import de.mobilcom.debitel.cloud.android.authentication.AuthenticatorActivity;
 
 public class AccountSelectActivity extends SherlockListActivity implements
         AccountManagerCallback<Boolean> {
diff --git a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/ConflictsResolveActivity.java
similarity index 84%
rename from src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
rename to src/de/mobilcom/debitel/cloud/android/ui/activity/ConflictsResolveActivity.java
index 61ac8f5f..e87febb3 100644
--- a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/ConflictsResolveActivity.java
@@ -16,16 +16,16 @@
  *
  */
 
-package com.owncloud.android.ui.activity;
+package de.mobilcom.debitel.cloud.android.ui.activity;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.ui.dialog.ConflictsResolveDialog;
-import com.owncloud.android.ui.dialog.ConflictsResolveDialog.Decision;
-import com.owncloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionMadeListener;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
+import de.mobilcom.debitel.cloud.android.ui.dialog.ConflictsResolveDialog;
+import de.mobilcom.debitel.cloud.android.ui.dialog.ConflictsResolveDialog.Decision;
+import de.mobilcom.debitel.cloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionMadeListener;
 
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
similarity index 96%
rename from src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
rename to src/de/mobilcom/debitel/cloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
index d61626c0..77645ab3 100644
--- a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.ui.activity;
+package de.mobilcom.debitel.cloud.android.ui.activity;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -39,12 +39,13 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
-import com.owncloud.android.utils.FileStorageUtils;
+
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.ui.dialog.IndeterminateProgressDialog;
+import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 
 /**
diff --git a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/FailedUploadActivity.java
similarity index 92%
rename from src/com/owncloud/android/ui/activity/FailedUploadActivity.java
rename to src/de/mobilcom/debitel/cloud/android/ui/activity/FailedUploadActivity.java
index 4c13fb27..13a383a7 100644
--- a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/FailedUploadActivity.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.ui.activity;
+package de.mobilcom.debitel.cloud.android.ui.activity;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -24,7 +24,7 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.R;
 
 /**
  * This Activity is used to display a detail message for failed uploads
diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/FileActivity.java
similarity index 94%
rename from src/com/owncloud/android/ui/activity/FileActivity.java
rename to src/de/mobilcom/debitel/cloud/android/ui/activity/FileActivity.java
index 1faf8b1f..f85b5fcd 100644
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/FileActivity.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.ui.activity;
+package de.mobilcom.debitel.cloud.android.ui.activity;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -29,11 +29,12 @@ import android.os.Bundle;
 import android.webkit.MimeTypeMap;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
-import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.datamodel.OCFile;
+
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
 
 import eu.alefzero.webdav.WebdavUtils;
 
@@ -44,9 +45,9 @@ import eu.alefzero.webdav.WebdavUtils;
  */
 public abstract class FileActivity extends SherlockFragmentActivity {
 
-    public static final String EXTRA_FILE = "com.owncloud.android.ui.activity.FILE";
-    public static final String EXTRA_ACCOUNT = "com.owncloud.android.ui.activity.ACCOUNT";
-    public static final String EXTRA_WAITING_TO_PREVIEW = "com.owncloud.android.ui.activity.WAITING_TO_PREVIEW";
+    public static final String EXTRA_FILE = "de.mobilcom.debitel.cloud.android.ui.activity.FILE";
+    public static final String EXTRA_ACCOUNT = "de.mobilcom.debitel.cloud.android.ui.activity.ACCOUNT";
+    public static final String EXTRA_WAITING_TO_PREVIEW = "de.mobilcom.debitel.cloud.android.ui.activity.WAITING_TO_PREVIEW";
     
     public static final String TAG = FileActivity.class.getSimpleName(); 
     
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/FileDisplayActivity.java
similarity index 95%
rename from src/com/owncloud/android/ui/activity/FileDisplayActivity.java
rename to src/de/mobilcom/debitel/cloud/android/ui/activity/FileDisplayActivity.java
index 7721133f..908e4a18 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/FileDisplayActivity.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.ui.activity;
+package de.mobilcom.debitel.cloud.android.ui.activity;
 
 import java.io.File;
 
@@ -57,38 +57,39 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
-import com.owncloud.android.R;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.services.FileDownloader;
-import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
-import com.owncloud.android.files.services.FileObserverService;
-import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
-import com.owncloud.android.operations.CreateFolderOperation;
-import com.owncloud.android.operations.OnRemoteOperationListener;
-import com.owncloud.android.operations.RemoteOperation;
-import com.owncloud.android.operations.RemoteOperationResult;
-import com.owncloud.android.operations.RemoveFileOperation;
-import com.owncloud.android.operations.RenameFileOperation;
-import com.owncloud.android.operations.SynchronizeFileOperation;
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.syncadapter.FileSyncService;
-import com.owncloud.android.ui.dialog.EditNameDialog;
-import com.owncloud.android.ui.dialog.LoadingDialog;
-import com.owncloud.android.ui.dialog.SslValidatorDialog;
-import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
-import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
-import com.owncloud.android.ui.fragment.FileDetailFragment;
-import com.owncloud.android.ui.fragment.FileFragment;
-import com.owncloud.android.ui.fragment.OCFileListFragment;
-import com.owncloud.android.ui.preview.PreviewImageActivity;
-import com.owncloud.android.ui.preview.PreviewImageFragment;
-import com.owncloud.android.ui.preview.PreviewMediaFragment;
-import com.owncloud.android.ui.preview.PreviewVideoActivity;
+
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.files.services.FileDownloader;
+import de.mobilcom.debitel.cloud.android.files.services.FileObserverService;
+import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
+import de.mobilcom.debitel.cloud.android.files.services.FileDownloader.FileDownloaderBinder;
+import de.mobilcom.debitel.cloud.android.files.services.FileUploader.FileUploaderBinder;
+import de.mobilcom.debitel.cloud.android.operations.CreateFolderOperation;
+import de.mobilcom.debitel.cloud.android.operations.OnRemoteOperationListener;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
+import de.mobilcom.debitel.cloud.android.operations.RemoveFileOperation;
+import de.mobilcom.debitel.cloud.android.operations.RenameFileOperation;
+import de.mobilcom.debitel.cloud.android.operations.SynchronizeFileOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
+import de.mobilcom.debitel.cloud.android.syncadapter.FileSyncService;
+import de.mobilcom.debitel.cloud.android.ui.dialog.EditNameDialog;
+import de.mobilcom.debitel.cloud.android.ui.dialog.LoadingDialog;
+import de.mobilcom.debitel.cloud.android.ui.dialog.SslValidatorDialog;
+import de.mobilcom.debitel.cloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
+import de.mobilcom.debitel.cloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
+import de.mobilcom.debitel.cloud.android.ui.fragment.FileDetailFragment;
+import de.mobilcom.debitel.cloud.android.ui.fragment.FileFragment;
+import de.mobilcom.debitel.cloud.android.ui.fragment.OCFileListFragment;
+import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageActivity;
+import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageFragment;
+import de.mobilcom.debitel.cloud.android.ui.preview.PreviewMediaFragment;
+import de.mobilcom.debitel.cloud.android.ui.preview.PreviewVideoActivity;
 
 /**
  * Displays, what files the user has available in his ownCloud.
@@ -126,7 +127,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     
     private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
 
-    public static final String ACTION_DETAILS = "com.owncloud.android.ui.activity.action.DETAILS";
+    public static final String ACTION_DETAILS = "de.mobilcom.debitel.cloud.android.ui.activity.action.DETAILS";
 
     private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;
     private static final int ACTION_SELECT_MULTIPLE_FILES = 2;
diff --git a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/GenericExplanationActivity.java
similarity index 97%
rename from src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
rename to src/de/mobilcom/debitel/cloud/android/ui/activity/GenericExplanationActivity.java
index 4c433a93..2921a838 100644
--- a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/GenericExplanationActivity.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.ui.activity;
+package de.mobilcom.debitel.cloud.android.ui.activity;
 
 import java.util.ArrayList;
 
@@ -31,7 +31,8 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.owncloud.android.R;
+
+import de.mobilcom.debitel.cloud.android.R;
 
 /**
  * Activity showing a text message and, optionally, a couple list of single or paired text strings.
diff --git a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/InstantUploadActivity.java
similarity index 96%
rename from src/com/owncloud/android/ui/activity/InstantUploadActivity.java
rename to src/de/mobilcom/debitel/cloud/android/ui/activity/InstantUploadActivity.java
index f0ee7219..9094422b 100644
--- a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/InstantUploadActivity.java
@@ -14,7 +14,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.activity;
+package de.mobilcom.debitel.cloud.android.ui.activity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -41,13 +41,13 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.db.DbHandler;
-import com.owncloud.android.files.InstantUploadBroadcastReceiver;
-import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.utils.FileStorageUtils;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
+import de.mobilcom.debitel.cloud.android.db.DbHandler;
+import de.mobilcom.debitel.cloud.android.files.InstantUploadBroadcastReceiver;
+import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
+import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 /**
  * This Activity is used to display a list with images they could not be
@@ -445,7 +445,7 @@ public class InstantUploadActivity extends Activity {
             i.putExtra(FileUploader.KEY_LOCAL_FILE, img_path);
             i.putExtra(FileUploader.KEY_REMOTE_FILE, filename);
             i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);
-            i.putExtra(com.owncloud.android.files.services.FileUploader.KEY_INSTANT_UPLOAD, true);
+            i.putExtra(de.mobilcom.debitel.cloud.android.files.services.FileUploader.KEY_INSTANT_UPLOAD, true);
 
             final String msg = "try to upload file with name :" + filename;
             Log_OC.d(LOG_TAG, msg);
diff --git a/src/com/owncloud/android/ui/activity/LandingActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/LandingActivity.java
similarity index 91%
rename from src/com/owncloud/android/ui/activity/LandingActivity.java
rename to src/de/mobilcom/debitel/cloud/android/ui/activity/LandingActivity.java
index 45ed279d..5d6b69f3 100644
--- a/src/com/owncloud/android/ui/activity/LandingActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/LandingActivity.java
@@ -14,10 +14,9 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.activity;
+package de.mobilcom.debitel.cloud.android.ui.activity;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.owncloud.android.ui.adapter.LandingScreenAdapter;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -33,8 +32,9 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.GridView;
 import android.widget.Toast;
 
-import com.owncloud.android.MainApp;
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.ui.adapter.LandingScreenAdapter;
 
 /**
  * This activity is used as a landing page when the user first opens this app.
@@ -64,7 +64,7 @@ public class LandingActivity extends SherlockFragmentActivity implements
             // Start device tracking service
             Intent locationServiceIntent = new Intent();
             locationServiceIntent
-                    .setAction("com.owncloud.android.location.LocationLauncher");
+                    .setAction("de.mobilcom.debitel.cloud.android.location.LocationLauncher");
             sendBroadcast(locationServiceIntent);
         }
 
diff --git a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/LogHistoryActivity.java
similarity index 94%
rename from src/com/owncloud/android/ui/activity/LogHistoryActivity.java
rename to src/de/mobilcom/debitel/cloud/android/ui/activity/LogHistoryActivity.java
index 0c99fcfa..2a3698ea 100644
--- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/LogHistoryActivity.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.ui.activity;
+package de.mobilcom.debitel.cloud.android.ui.activity;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -32,9 +32,10 @@ import android.widget.ListView;
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockPreferenceActivity;
 import com.actionbarsherlock.view.MenuItem;
-import com.owncloud.android.R;
-import com.owncloud.android.ui.adapter.LogListAdapter;
-import com.owncloud.android.utils.FileStorageUtils;
+
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.ui.adapter.LogListAdapter;
+import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 
 
diff --git a/src/com/owncloud/android/ui/activity/PinCodeActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/PinCodeActivity.java
similarity index 98%
rename from src/com/owncloud/android/ui/activity/PinCodeActivity.java
rename to src/de/mobilcom/debitel/cloud/android/ui/activity/PinCodeActivity.java
index 215ea45f..8c5d0774 100644
--- a/src/com/owncloud/android/ui/activity/PinCodeActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/PinCodeActivity.java
@@ -14,13 +14,13 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.activity;
+package de.mobilcom.debitel.cloud.android.ui.activity;
 
 import java.util.Arrays;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.R;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -42,8 +42,8 @@ import android.widget.TextView;
 public class PinCodeActivity extends SherlockFragmentActivity {
 
   
-    public final static String EXTRA_ACTIVITY = "com.owncloud.android.ui.activity.PinCodeActivity.ACTIVITY";
-    public final static String EXTRA_NEW_STATE = "com.owncloud.android.ui.activity.PinCodeActivity.NEW_STATE";
+    public final static String EXTRA_ACTIVITY = "de.mobilcom.debitel.cloud.android.ui.activity.PinCodeActivity.ACTIVITY";
+    public final static String EXTRA_NEW_STATE = "de.mobilcom.debitel.cloud.android.ui.activity.PinCodeActivity.NEW_STATE";
     
     Button bCancel;
     TextView mPinHdr;
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/Preferences.java
similarity index 97%
rename from src/com/owncloud/android/ui/activity/Preferences.java
rename to src/de/mobilcom/debitel/cloud/android/ui/activity/Preferences.java
index cd87f31a..404a7ca1 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/Preferences.java
@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.activity;
+package de.mobilcom.debitel.cloud.android.ui.activity;
 
 import java.util.Vector;
 
@@ -38,10 +38,11 @@ import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockPreferenceActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.OwnCloudSession;
-import com.owncloud.android.R;
-import com.owncloud.android.db.DbHandler;
+
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.OwnCloudSession;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.db.DbHandler;
 
 /**
  * An Activity that allows the user to change the application's settings.
@@ -347,7 +348,7 @@ public class Preferences extends SherlockPreferenceActivity implements OnPrefere
         else if (preference.equals(mDeviceTracking)) {
             Intent locationServiceIntent = new Intent();
             locationServiceIntent
-                    .setAction("com.owncloud.android.location.LocationLauncher");
+                    .setAction("de.mobilcom.debitel.cloud.android.location.LocationLauncher");
             locationServiceIntent.putExtra("TRACKING_SETTING",
                     (Boolean) newValue);
             sendBroadcast(locationServiceIntent);
diff --git a/src/com/owncloud/android/ui/activity/PreferencesNewSession.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/PreferencesNewSession.java
similarity index 96%
rename from src/com/owncloud/android/ui/activity/PreferencesNewSession.java
rename to src/de/mobilcom/debitel/cloud/android/ui/activity/PreferencesNewSession.java
index c43b29f2..d78b1e95 100644
--- a/src/com/owncloud/android/ui/activity/PreferencesNewSession.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/PreferencesNewSession.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.ui.activity;
+package de.mobilcom.debitel.cloud.android.ui.activity;
 
 import android.accounts.AccountAuthenticatorActivity;
 import android.app.Activity;
diff --git a/src/com/owncloud/android/ui/activity/TransferServiceGetter.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/TransferServiceGetter.java
similarity index 84%
rename from src/com/owncloud/android/ui/activity/TransferServiceGetter.java
rename to src/de/mobilcom/debitel/cloud/android/ui/activity/TransferServiceGetter.java
index fbc348d9..acf17e53 100644
--- a/src/com/owncloud/android/ui/activity/TransferServiceGetter.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/TransferServiceGetter.java
@@ -16,10 +16,10 @@
  *
  */
 
-package com.owncloud.android.ui.activity;
+package de.mobilcom.debitel.cloud.android.ui.activity;
 
-import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
-import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
+import de.mobilcom.debitel.cloud.android.files.services.FileDownloader.FileDownloaderBinder;
+import de.mobilcom.debitel.cloud.android.files.services.FileUploader.FileUploaderBinder;
 
 public interface TransferServiceGetter {
 
diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/activity/UploadFilesActivity.java
similarity index 95%
rename from src/com/owncloud/android/ui/activity/UploadFilesActivity.java
rename to src/de/mobilcom/debitel/cloud/android/ui/activity/UploadFilesActivity.java
index a6031cdb..b9b7f0dc 100644
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/activity/UploadFilesActivity.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.ui.activity;
+package de.mobilcom.debitel.cloud.android.ui.activity;
 
 import java.io.File;
 
@@ -35,14 +35,14 @@ import android.widget.TextView;
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
 import com.actionbarsherlock.view.MenuItem;
-import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
-import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
-import com.owncloud.android.ui.fragment.LocalFileListFragment;
-import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
-import com.owncloud.android.utils.FileStorageUtils;
-
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
+
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.ui.dialog.IndeterminateProgressDialog;
+import de.mobilcom.debitel.cloud.android.ui.fragment.ConfirmationDialogFragment;
+import de.mobilcom.debitel.cloud.android.ui.fragment.LocalFileListFragment;
+import de.mobilcom.debitel.cloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
+import de.mobilcom.debitel.cloud.android.utils.FileStorageUtils;
 
 /**
  * Displays local files and let the user choose what of them wants to upload
diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/de/mobilcom/debitel/cloud/android/ui/adapter/FileListListAdapter.java
similarity index 90%
rename from src/com/owncloud/android/ui/adapter/FileListListAdapter.java
rename to src/de/mobilcom/debitel/cloud/android/ui/adapter/FileListListAdapter.java
index 3e8eecd5..734623e5 100644
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/adapter/FileListListAdapter.java
@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.adapter;
+package de.mobilcom.debitel.cloud.android.ui.adapter;
 
 import android.accounts.Account;
 import android.content.Context;
@@ -28,14 +28,14 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.owncloud.android.DisplayUtils;
-import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
-import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
-import com.owncloud.android.ui.activity.TransferServiceGetter;
+import de.mobilcom.debitel.cloud.android.DisplayUtils;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
+import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.files.services.FileDownloader.FileDownloaderBinder;
+import de.mobilcom.debitel.cloud.android.files.services.FileUploader.FileUploaderBinder;
+import de.mobilcom.debitel.cloud.android.ui.activity.TransferServiceGetter;
 
 import java.util.Vector;
 
diff --git a/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java b/src/de/mobilcom/debitel/cloud/android/ui/adapter/LandingScreenAdapter.java
similarity index 89%
rename from src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java
rename to src/de/mobilcom/debitel/cloud/android/ui/adapter/LandingScreenAdapter.java
index f77ce520..42491f85 100644
--- a/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/adapter/LandingScreenAdapter.java
@@ -15,11 +15,8 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.adapter;
+package de.mobilcom.debitel.cloud.android.ui.adapter;
 
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.ui.activity.FileDisplayActivity;
-import com.owncloud.android.ui.activity.Preferences;
 
 import android.content.Context;
 import android.content.Intent;
@@ -29,7 +26,10 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
+import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity;
+import de.mobilcom.debitel.cloud.android.ui.activity.Preferences;
 
 /**
  * Populates the landing screen icons.
diff --git a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/de/mobilcom/debitel/cloud/android/ui/adapter/LocalFileListAdapter.java
similarity index 97%
rename from src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
rename to src/de/mobilcom/debitel/cloud/android/ui/adapter/LocalFileListAdapter.java
index c93a2d9c..9b375774 100644
--- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/adapter/LocalFileListAdapter.java
@@ -15,14 +15,14 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.adapter;
+package de.mobilcom.debitel.cloud.android.ui.adapter;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.Comparator;
 
-import com.owncloud.android.DisplayUtils;
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.DisplayUtils;
+import de.mobilcom.debitel.cloud.android.R;
 
 import android.content.Context;
 import android.view.LayoutInflater;
diff --git a/src/com/owncloud/android/ui/adapter/LogListAdapter.java b/src/de/mobilcom/debitel/cloud/android/ui/adapter/LogListAdapter.java
similarity index 95%
rename from src/com/owncloud/android/ui/adapter/LogListAdapter.java
rename to src/de/mobilcom/debitel/cloud/android/ui/adapter/LogListAdapter.java
index 6b6e8f6f..a0a90829 100644
--- a/src/com/owncloud/android/ui/adapter/LogListAdapter.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/adapter/LogListAdapter.java
@@ -1,4 +1,4 @@
-package com.owncloud.android.ui.adapter;
+package de.mobilcom.debitel.cloud.android.ui.adapter;
 
 import java.io.File;
 
@@ -13,7 +13,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.R;
 
 
 public class LogListAdapter extends ArrayAdapter<String> {
diff --git a/src/com/owncloud/android/ui/dialog/ChangelogDialog.java b/src/de/mobilcom/debitel/cloud/android/ui/dialog/ChangelogDialog.java
similarity index 97%
rename from src/com/owncloud/android/ui/dialog/ChangelogDialog.java
rename to src/de/mobilcom/debitel/cloud/android/ui/dialog/ChangelogDialog.java
index 1822ce0a..0ba97d99 100644
--- a/src/com/owncloud/android/ui/dialog/ChangelogDialog.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/dialog/ChangelogDialog.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.ui.dialog;
+package de.mobilcom.debitel.cloud.android.ui.dialog;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -24,7 +24,8 @@ import android.os.Bundle;
 import android.webkit.WebView;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
-import com.owncloud.android.R;
+
+import de.mobilcom.debitel.cloud.android.R;
 
 /**
  * Dialog to show the contents of res/raw/CHANGELOG.txt
diff --git a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/src/de/mobilcom/debitel/cloud/android/ui/dialog/ConflictsResolveDialog.java
similarity index 97%
rename from src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
rename to src/de/mobilcom/debitel/cloud/android/ui/dialog/ConflictsResolveDialog.java
index 6da58bc1..7d7bc4ad 100644
--- a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/dialog/ConflictsResolveDialog.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.ui.dialog;
+package de.mobilcom.debitel.cloud.android.ui.dialog;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -27,7 +27,8 @@ import android.support.v4.app.FragmentTransaction;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.owncloud.android.R;
+
+import de.mobilcom.debitel.cloud.android.R;
 
 /**
  * Dialog which will be displayed to user upon keep-in-sync file conflict.
diff --git a/src/com/owncloud/android/ui/dialog/EditNameDialog.java b/src/de/mobilcom/debitel/cloud/android/ui/dialog/EditNameDialog.java
similarity index 98%
rename from src/com/owncloud/android/ui/dialog/EditNameDialog.java
rename to src/de/mobilcom/debitel/cloud/android/ui/dialog/EditNameDialog.java
index d45140e2..e3240464 100644
--- a/src/com/owncloud/android/ui/dialog/EditNameDialog.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/dialog/EditNameDialog.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.ui.dialog;
+package de.mobilcom.debitel.cloud.android.ui.dialog;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -29,7 +29,8 @@ import android.widget.EditText;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
-import com.owncloud.android.R;
+
+import de.mobilcom.debitel.cloud.android.R;
 
 
 /**
diff --git a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java b/src/de/mobilcom/debitel/cloud/android/ui/dialog/IndeterminateProgressDialog.java
similarity index 97%
rename from src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
rename to src/de/mobilcom/debitel/cloud/android/ui/dialog/IndeterminateProgressDialog.java
index 1dd586dc..b44c04b9 100644
--- a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/dialog/IndeterminateProgressDialog.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.ui.dialog;
+package de.mobilcom.debitel.cloud.android.ui.dialog;
 
 import android.app.Dialog;
 import android.app.ProgressDialog;
@@ -25,7 +25,8 @@ import android.os.Bundle;
 import android.view.KeyEvent;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
-import com.owncloud.android.R;
+
+import de.mobilcom.debitel.cloud.android.R;
 
 public class IndeterminateProgressDialog extends SherlockDialogFragment {
 
diff --git a/src/com/owncloud/android/ui/dialog/LoadingDialog.java b/src/de/mobilcom/debitel/cloud/android/ui/dialog/LoadingDialog.java
similarity index 93%
rename from src/com/owncloud/android/ui/dialog/LoadingDialog.java
rename to src/de/mobilcom/debitel/cloud/android/ui/dialog/LoadingDialog.java
index 2203e039..7394cec3 100644
--- a/src/com/owncloud/android/ui/dialog/LoadingDialog.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/dialog/LoadingDialog.java
@@ -1,6 +1,6 @@
-package com.owncloud.android.ui.dialog;
+package de.mobilcom.debitel.cloud.android.ui.dialog;
 
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.R;
 
 import android.app.Dialog;
 import android.os.Bundle;
diff --git a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java b/src/de/mobilcom/debitel/cloud/android/ui/dialog/SamlWebViewDialog.java
similarity index 96%
rename from src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
rename to src/de/mobilcom/debitel/cloud/android/ui/dialog/SamlWebViewDialog.java
index a5219a22..d897b606 100644
--- a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/dialog/SamlWebViewDialog.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.ui.dialog;
+package de.mobilcom.debitel.cloud.android.ui.dialog;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -35,10 +35,11 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
-import com.owncloud.android.authentication.SsoWebViewClient;
-import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;
+
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.authentication.SsoWebViewClient;
+import de.mobilcom.debitel.cloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;
 
 import eu.alefzero.webdav.WebdavClient;
 
diff --git a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java b/src/de/mobilcom/debitel/cloud/android/ui/dialog/SslValidatorDialog.java
similarity index 97%
rename from src/com/owncloud/android/ui/dialog/SslValidatorDialog.java
rename to src/de/mobilcom/debitel/cloud/android/ui/dialog/SslValidatorDialog.java
index 6ae4156d..2b6f1684 100644
--- a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/dialog/SslValidatorDialog.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.ui.dialog;
+package de.mobilcom.debitel.cloud.android.ui.dialog;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
@@ -37,11 +37,11 @@ import android.view.Window;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
-import com.owncloud.android.network.CertificateCombinedException;
-import com.owncloud.android.network.OwnCloudClientUtils;
-import com.owncloud.android.operations.RemoteOperationResult;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.network.CertificateCombinedException;
+import de.mobilcom.debitel.cloud.android.network.OwnCloudClientUtils;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
 
 /**
  * Dialog to request the user about a certificate that could not be validated with the certificates store in the system.
diff --git a/src/com/owncloud/android/ui/dialog/SsoWebView.java b/src/de/mobilcom/debitel/cloud/android/ui/dialog/SsoWebView.java
similarity index 95%
rename from src/com/owncloud/android/ui/dialog/SsoWebView.java
rename to src/de/mobilcom/debitel/cloud/android/ui/dialog/SsoWebView.java
index 3a71139d..2186bc43 100644
--- a/src/com/owncloud/android/ui/dialog/SsoWebView.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/dialog/SsoWebView.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.ui.dialog;
+package de.mobilcom.debitel.cloud.android.ui.dialog;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java b/src/de/mobilcom/debitel/cloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java
similarity index 94%
rename from src/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java
rename to src/de/mobilcom/debitel/cloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java
index f0961037..d01e6e6e 100644
--- a/src/com/owncloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/fragment/AuthenticatorAccountDetailsFragment.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.ui.fragment;
+package de.mobilcom.debitel.cloud.android.ui.fragment;
 
 import com.actionbarsherlock.app.SherlockFragment;
 
diff --git a/src/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java b/src/de/mobilcom/debitel/cloud/android/ui/fragment/AuthenticatorGetStartedFragment.java
similarity index 94%
rename from src/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java
rename to src/de/mobilcom/debitel/cloud/android/ui/fragment/AuthenticatorGetStartedFragment.java
index 5abf55d8..8f38fd4c 100644
--- a/src/com/owncloud/android/ui/fragment/AuthenticatorGetStartedFragment.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/fragment/AuthenticatorGetStartedFragment.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.ui.fragment;
+package de.mobilcom.debitel.cloud.android.ui.fragment;
 
 import com.actionbarsherlock.app.SherlockFragment;
 
diff --git a/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java b/src/de/mobilcom/debitel/cloud/android/ui/fragment/ConfirmationDialogFragment.java
similarity index 98%
rename from src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java
rename to src/de/mobilcom/debitel/cloud/android/ui/fragment/ConfirmationDialogFragment.java
index d528b341..641ba1df 100644
--- a/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/fragment/ConfirmationDialogFragment.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.ui.fragment;
+package de.mobilcom.debitel.cloud.android.ui.fragment;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -24,7 +24,8 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
-import com.owncloud.android.Log_OC;
+
+import de.mobilcom.debitel.cloud.android.Log_OC;
 
 public class ConfirmationDialogFragment extends SherlockDialogFragment {
 
diff --git a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/de/mobilcom/debitel/cloud/android/ui/fragment/ExtendedListFragment.java
similarity index 94%
rename from src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
rename to src/de/mobilcom/debitel/cloud/android/ui/fragment/ExtendedListFragment.java
index 3e519a8b..b152b255 100644
--- a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/fragment/ExtendedListFragment.java
@@ -16,12 +16,13 @@
  *
  */
 
-package com.owncloud.android.ui.fragment;
+package de.mobilcom.debitel.cloud.android.ui.fragment;
 
 import com.actionbarsherlock.app.SherlockFragment;
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
-import com.owncloud.android.ui.ExtendedListView;
+
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.ui.ExtendedListView;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/de/mobilcom/debitel/cloud/android/ui/fragment/FileDetailFragment.java
similarity index 95%
rename from src/com/owncloud/android/ui/fragment/FileDetailFragment.java
rename to src/de/mobilcom/debitel/cloud/android/ui/fragment/FileDetailFragment.java
index 944decfa..bb0e4b91 100644
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/fragment/FileDetailFragment.java
@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.fragment;
+package de.mobilcom.debitel.cloud.android.ui.fragment;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
@@ -43,28 +43,29 @@ import android.widget.Toast;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import com.owncloud.android.DisplayUtils;
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
-import com.owncloud.android.files.services.FileObserverService;
-import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
-import com.owncloud.android.operations.OnRemoteOperationListener;
-import com.owncloud.android.operations.RemoteOperation;
-import com.owncloud.android.operations.RemoteOperationResult;
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.operations.RemoveFileOperation;
-import com.owncloud.android.operations.RenameFileOperation;
-import com.owncloud.android.operations.SynchronizeFileOperation;
-import com.owncloud.android.ui.activity.ConflictsResolveActivity;
-import com.owncloud.android.ui.activity.FileActivity;
-import com.owncloud.android.ui.activity.FileDisplayActivity;
-import com.owncloud.android.ui.dialog.EditNameDialog;
-import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
-import com.owncloud.android.ui.preview.PreviewImageFragment;
+
+import de.mobilcom.debitel.cloud.android.DisplayUtils;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.files.services.FileObserverService;
+import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
+import de.mobilcom.debitel.cloud.android.files.services.FileDownloader.FileDownloaderBinder;
+import de.mobilcom.debitel.cloud.android.files.services.FileUploader.FileUploaderBinder;
+import de.mobilcom.debitel.cloud.android.operations.OnRemoteOperationListener;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
+import de.mobilcom.debitel.cloud.android.operations.RemoveFileOperation;
+import de.mobilcom.debitel.cloud.android.operations.RenameFileOperation;
+import de.mobilcom.debitel.cloud.android.operations.SynchronizeFileOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult.ResultCode;
+import de.mobilcom.debitel.cloud.android.ui.activity.ConflictsResolveActivity;
+import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity;
+import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity;
+import de.mobilcom.debitel.cloud.android.ui.dialog.EditNameDialog;
+import de.mobilcom.debitel.cloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
+import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageFragment;
 
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 
diff --git a/src/com/owncloud/android/ui/fragment/FileFragment.java b/src/de/mobilcom/debitel/cloud/android/ui/fragment/FileFragment.java
similarity index 91%
rename from src/com/owncloud/android/ui/fragment/FileFragment.java
rename to src/de/mobilcom/debitel/cloud/android/ui/fragment/FileFragment.java
index 4c6f3e71..df1a0d5b 100644
--- a/src/com/owncloud/android/ui/fragment/FileFragment.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/fragment/FileFragment.java
@@ -15,14 +15,15 @@
  *
  */
 
-package com.owncloud.android.ui.fragment;
+package de.mobilcom.debitel.cloud.android.ui.fragment;
 
 import android.support.v4.app.Fragment;
 
 import com.actionbarsherlock.app.SherlockFragment;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.FileHandler;
-import com.owncloud.android.ui.activity.TransferServiceGetter;
+
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.files.FileHandler;
+import de.mobilcom.debitel.cloud.android.ui.activity.TransferServiceGetter;
 
 /**
  * Common methods for {@link Fragment}s containing {@link OCFile}s
diff --git a/src/com/owncloud/android/ui/fragment/LandingPageFragment.java b/src/de/mobilcom/debitel/cloud/android/ui/fragment/LandingPageFragment.java
similarity index 85%
rename from src/com/owncloud/android/ui/fragment/LandingPageFragment.java
rename to src/de/mobilcom/debitel/cloud/android/ui/fragment/LandingPageFragment.java
index 9d87a45a..45667ea2 100644
--- a/src/com/owncloud/android/ui/fragment/LandingPageFragment.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/fragment/LandingPageFragment.java
@@ -15,18 +15,18 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.fragment;
+package de.mobilcom.debitel.cloud.android.ui.fragment;
 
 import com.actionbarsherlock.app.SherlockFragment;
-import com.owncloud.android.ui.activity.LandingActivity;
-import com.owncloud.android.ui.adapter.LandingScreenAdapter;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.ui.activity.LandingActivity;
+import de.mobilcom.debitel.cloud.android.ui.adapter.LandingScreenAdapter;
 
 /**
  * Used on the Landing page to display what Components of the ownCloud there
diff --git a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/src/de/mobilcom/debitel/cloud/android/ui/fragment/LocalFileListFragment.java
similarity index 97%
rename from src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
rename to src/de/mobilcom/debitel/cloud/android/ui/fragment/LocalFileListFragment.java
index 24421fa5..aa1e34a4 100644
--- a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/fragment/LocalFileListFragment.java
@@ -15,11 +15,10 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.fragment;
+package de.mobilcom.debitel.cloud.android.ui.fragment;
 
 import java.io.File;
 
-import com.owncloud.android.ui.adapter.LocalFileListAdapter;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -32,8 +31,9 @@ import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.ListView;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.ui.adapter.LocalFileListAdapter;
 
 /**
  * A Fragment that lists all files and folders in a given LOCAL path.
diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/de/mobilcom/debitel/cloud/android/ui/fragment/OCFileListFragment.java
similarity index 91%
rename from src/com/owncloud/android/ui/fragment/OCFileListFragment.java
rename to src/de/mobilcom/debitel/cloud/android/ui/fragment/OCFileListFragment.java
index be596eb1..6b05c2b4 100644
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/fragment/OCFileListFragment.java
@@ -15,33 +15,33 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.fragment;
+package de.mobilcom.debitel.cloud.android.ui.fragment;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.FileHandler;
-import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
-import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
-import com.owncloud.android.operations.OnRemoteOperationListener;
-import com.owncloud.android.operations.RemoteOperation;
-import com.owncloud.android.operations.RemoveFileOperation;
-import com.owncloud.android.operations.RenameFileOperation;
-import com.owncloud.android.operations.SynchronizeFileOperation;
-import com.owncloud.android.ui.activity.FileDisplayActivity;
-import com.owncloud.android.ui.activity.TransferServiceGetter;
-import com.owncloud.android.ui.adapter.FileListListAdapter;
-import com.owncloud.android.ui.dialog.EditNameDialog;
-import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
-import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
-import com.owncloud.android.ui.preview.PreviewImageFragment;
-import com.owncloud.android.ui.preview.PreviewMediaFragment;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
+import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.files.FileHandler;
+import de.mobilcom.debitel.cloud.android.files.services.FileDownloader.FileDownloaderBinder;
+import de.mobilcom.debitel.cloud.android.files.services.FileUploader.FileUploaderBinder;
+import de.mobilcom.debitel.cloud.android.operations.OnRemoteOperationListener;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoveFileOperation;
+import de.mobilcom.debitel.cloud.android.operations.RenameFileOperation;
+import de.mobilcom.debitel.cloud.android.operations.SynchronizeFileOperation;
+import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity;
+import de.mobilcom.debitel.cloud.android.ui.activity.TransferServiceGetter;
+import de.mobilcom.debitel.cloud.android.ui.adapter.FileListListAdapter;
+import de.mobilcom.debitel.cloud.android.ui.dialog.EditNameDialog;
+import de.mobilcom.debitel.cloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
+import de.mobilcom.debitel.cloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
+import de.mobilcom.debitel.cloud.android.ui.preview.PreviewImageFragment;
+import de.mobilcom.debitel.cloud.android.ui.preview.PreviewMediaFragment;
 
 import android.accounts.Account;
 import android.app.Activity;
@@ -64,7 +64,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
     
     private static final String TAG = OCFileListFragment.class.getSimpleName();
 
-    private static final String MY_PACKAGE = OCFileListFragment.class.getPackage() != null ? OCFileListFragment.class.getPackage().getName() : "com.owncloud.android.ui.fragment";
+    private static final String MY_PACKAGE = OCFileListFragment.class.getPackage() != null ? OCFileListFragment.class.getPackage().getName() : "de.mobilcom.debitel.cloud.android.ui.fragment";
     private static final String EXTRA_FILE = MY_PACKAGE + ".extra.FILE";
     
     private OCFileListFragment.ContainerActivity mContainerActivity;
diff --git a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java b/src/de/mobilcom/debitel/cloud/android/ui/preview/FileDownloadFragment.java
similarity index 97%
rename from src/com/owncloud/android/ui/preview/FileDownloadFragment.java
rename to src/de/mobilcom/debitel/cloud/android/ui/preview/FileDownloadFragment.java
index d3d5fe91..e2eade6f 100644
--- a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/preview/FileDownloadFragment.java
@@ -15,7 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.preview;
+package de.mobilcom.debitel.cloud.android.ui.preview;
 
 import java.lang.ref.WeakReference;
 
@@ -31,12 +31,12 @@ import android.widget.ImageButton;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
-import com.owncloud.android.ui.fragment.FileFragment;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.files.services.FileDownloader.FileDownloaderBinder;
+import de.mobilcom.debitel.cloud.android.ui.fragment.FileFragment;
 
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 
diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImageActivity.java
similarity index 94%
rename from src/com/owncloud/android/ui/preview/PreviewImageActivity.java
rename to src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImageActivity.java
index 6a80ffbd..892716d8 100644
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImageActivity.java
@@ -14,7 +14,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.preview;
+package de.mobilcom.debitel.cloud.android.ui.preview;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -35,21 +35,21 @@ import android.view.View.OnTouchListener;
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.services.FileDownloader;
-import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
-import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
-import com.owncloud.android.ui.activity.FileActivity;
-import com.owncloud.android.ui.activity.FileDisplayActivity;
-import com.owncloud.android.ui.dialog.LoadingDialog;
-import com.owncloud.android.ui.fragment.FileFragment;
-
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
+
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
+import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.files.services.FileDownloader;
+import de.mobilcom.debitel.cloud.android.files.services.FileUploader;
+import de.mobilcom.debitel.cloud.android.files.services.FileDownloader.FileDownloaderBinder;
+import de.mobilcom.debitel.cloud.android.files.services.FileUploader.FileUploaderBinder;
+import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity;
+import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity;
+import de.mobilcom.debitel.cloud.android.ui.dialog.LoadingDialog;
+import de.mobilcom.debitel.cloud.android.ui.fragment.FileFragment;
 
 /**
  *  Holds a swiping galley where image files contained in an ownCloud directory are shown
diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImageFragment.java
similarity index 96%
rename from src/com/owncloud/android/ui/preview/PreviewImageFragment.java
rename to src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImageFragment.java
index 578c56e8..011803e6 100644
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImageFragment.java
@@ -14,7 +14,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.preview;
+package de.mobilcom.debitel.cloud.android.ui.preview;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
@@ -50,17 +50,17 @@ import android.widget.Toast;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.operations.OnRemoteOperationListener;
-import com.owncloud.android.operations.RemoteOperation;
-import com.owncloud.android.operations.RemoteOperationResult;
-import com.owncloud.android.operations.RemoveFileOperation;
-import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
-import com.owncloud.android.ui.fragment.FileFragment;
-
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
+
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.operations.OnRemoteOperationListener;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
+import de.mobilcom.debitel.cloud.android.operations.RemoveFileOperation;
+import de.mobilcom.debitel.cloud.android.ui.fragment.ConfirmationDialogFragment;
+import de.mobilcom.debitel.cloud.android.ui.fragment.FileFragment;
 import eu.alefzero.webdav.WebdavUtils;
 
 
diff --git a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java b/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImagePagerAdapter.java
similarity index 97%
rename from src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
rename to src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImagePagerAdapter.java
index 3db62e96..8fcf61b0 100644
--- a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewImagePagerAdapter.java
@@ -14,7 +14,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.preview;
+package de.mobilcom.debitel.cloud.android.ui.preview;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -28,9 +28,9 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.view.ViewGroup;
 
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.ui.fragment.FileFragment;
+import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.ui.fragment.FileFragment;
 
 /**
  * Adapter class that provides Fragment instances  
diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewMediaFragment.java
similarity index 96%
rename from src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
rename to src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewMediaFragment.java
index 5ffd52ed..89af08f9 100644
--- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewMediaFragment.java
@@ -14,7 +14,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.owncloud.android.ui.preview;
+package de.mobilcom.debitel.cloud.android.ui.preview;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -52,22 +52,22 @@ import android.widget.VideoView;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.media.MediaControlView;
-import com.owncloud.android.media.MediaService;
-import com.owncloud.android.media.MediaServiceBinder;
-import com.owncloud.android.operations.OnRemoteOperationListener;
-import com.owncloud.android.operations.RemoteOperation;
-import com.owncloud.android.operations.RemoteOperationResult;
-import com.owncloud.android.operations.RemoveFileOperation;
-import com.owncloud.android.ui.activity.FileActivity;
-import com.owncloud.android.ui.activity.FileDisplayActivity;
-import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
-import com.owncloud.android.ui.fragment.FileFragment;
-
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
+
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.media.MediaControlView;
+import de.mobilcom.debitel.cloud.android.media.MediaService;
+import de.mobilcom.debitel.cloud.android.media.MediaServiceBinder;
+import de.mobilcom.debitel.cloud.android.operations.OnRemoteOperationListener;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperation;
+import de.mobilcom.debitel.cloud.android.operations.RemoteOperationResult;
+import de.mobilcom.debitel.cloud.android.operations.RemoveFileOperation;
+import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity;
+import de.mobilcom.debitel.cloud.android.ui.activity.FileDisplayActivity;
+import de.mobilcom.debitel.cloud.android.ui.fragment.ConfirmationDialogFragment;
+import de.mobilcom.debitel.cloud.android.ui.fragment.FileFragment;
 import eu.alefzero.webdav.WebdavUtils;
 
 /**
diff --git a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java b/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewVideoActivity.java
similarity index 93%
rename from src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
rename to src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewVideoActivity.java
index 0cab2e2b..bedb806f 100644
--- a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
+++ b/src/de/mobilcom/debitel/cloud/android/ui/preview/PreviewVideoActivity.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.ui.preview;
+package de.mobilcom.debitel.cloud.android.ui.preview;
 
 import android.accounts.Account;
 import android.app.AlertDialog;
@@ -30,15 +30,15 @@ import android.os.Bundle;
 import android.widget.MediaController;
 import android.widget.VideoView;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.media.MediaService;
-import com.owncloud.android.ui.activity.FileActivity;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils.AccountNotFoundException;
+import de.mobilcom.debitel.cloud.android.datamodel.DataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.FileDataStorageManager;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.media.MediaService;
+import de.mobilcom.debitel.cloud.android.ui.activity.FileActivity;
 
 /**
  *  Activity implementing a basic video player.
diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/de/mobilcom/debitel/cloud/android/utils/FileStorageUtils.java
similarity index 93%
rename from src/com/owncloud/android/utils/FileStorageUtils.java
rename to src/de/mobilcom/debitel/cloud/android/utils/FileStorageUtils.java
index 55399525..1608a995 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/de/mobilcom/debitel/cloud/android/utils/FileStorageUtils.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.owncloud.android.utils;
+package de.mobilcom.debitel.cloud.android.utils;
 
 import java.io.File;
 
@@ -25,9 +25,9 @@ import android.net.Uri;
 import android.os.Environment;
 import android.os.StatFs;
 
-import com.owncloud.android.MainApp;
-import com.owncloud.android.R;
-import com.owncloud.android.datamodel.OCFile;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.R;
+import de.mobilcom.debitel.cloud.android.datamodel.OCFile;
 
 /**
  * Static methods to help in access to local file system.
diff --git a/src/com/owncloud/android/utils/OwnCloudVersion.java b/src/de/mobilcom/debitel/cloud/android/utils/OwnCloudVersion.java
similarity index 98%
rename from src/com/owncloud/android/utils/OwnCloudVersion.java
rename to src/de/mobilcom/debitel/cloud/android/utils/OwnCloudVersion.java
index 630e7acd..e77f90f5 100644
--- a/src/com/owncloud/android/utils/OwnCloudVersion.java
+++ b/src/de/mobilcom/debitel/cloud/android/utils/OwnCloudVersion.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.utils;
+package de.mobilcom.debitel.cloud.android.utils;
 
 public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
     public static final OwnCloudVersion owncloud_v1 = new OwnCloudVersion(
diff --git a/src/com/owncloud/android/utils/RecursiveFileObserver.java b/src/de/mobilcom/debitel/cloud/android/utils/RecursiveFileObserver.java
similarity index 98%
rename from src/com/owncloud/android/utils/RecursiveFileObserver.java
rename to src/de/mobilcom/debitel/cloud/android/utils/RecursiveFileObserver.java
index be44f8f6..84c9bfdb 100644
--- a/src/com/owncloud/android/utils/RecursiveFileObserver.java
+++ b/src/de/mobilcom/debitel/cloud/android/utils/RecursiveFileObserver.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.owncloud.android.utils;
+package de.mobilcom.debitel.cloud.android.utils;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/com/owncloud/android/widgets/ActionEditText.java b/src/de/mobilcom/debitel/cloud/android/widgets/ActionEditText.java
similarity index 98%
rename from src/com/owncloud/android/widgets/ActionEditText.java
rename to src/de/mobilcom/debitel/cloud/android/widgets/ActionEditText.java
index efa6655b..039ca3af 100644
--- a/src/com/owncloud/android/widgets/ActionEditText.java
+++ b/src/de/mobilcom/debitel/cloud/android/widgets/ActionEditText.java
@@ -16,12 +16,12 @@
  *
  */
 
-package com.owncloud.android.widgets;
+package de.mobilcom.debitel.cloud.android.widgets;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import com.owncloud.android.R;
+import de.mobilcom.debitel.cloud.android.R;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
diff --git a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
index 103cd04a..86202479 100644
--- a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
+++ b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
@@ -29,8 +29,8 @@ import java.util.Set;
 
 import org.apache.commons.httpclient.methods.RequestEntity;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.network.ProgressiveDataTransferer;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.network.ProgressiveDataTransferer;
 
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 
diff --git a/src/eu/alefzero/webdav/FileRequestEntity.java b/src/eu/alefzero/webdav/FileRequestEntity.java
index a8f01d63..9754ef67 100644
--- a/src/eu/alefzero/webdav/FileRequestEntity.java
+++ b/src/eu/alefzero/webdav/FileRequestEntity.java
@@ -31,8 +31,8 @@ import java.util.Set;
 
 import org.apache.commons.httpclient.methods.RequestEntity;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.network.ProgressiveDataTransferer;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.network.ProgressiveDataTransferer;
 
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 
diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index c0eba542..8c54a53d 100644
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -41,11 +41,11 @@ import org.apache.commons.httpclient.params.HttpMethodParams;
 import org.apache.http.HttpStatus;
 import org.apache.http.params.CoreProtocolPNames;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
 
-import com.owncloud.android.network.BearerAuthScheme;
-import com.owncloud.android.network.BearerCredentials;
+import de.mobilcom.debitel.cloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.MainApp;
+import de.mobilcom.debitel.cloud.android.network.BearerAuthScheme;
+import de.mobilcom.debitel.cloud.android.network.BearerCredentials;
 
 import android.net.Uri;
 
diff --git a/src/eu/alefzero/webdav/WebdavEntry.java b/src/eu/alefzero/webdav/WebdavEntry.java
index 46923c66..3ed89389 100644
--- a/src/eu/alefzero/webdav/WebdavEntry.java
+++ b/src/eu/alefzero/webdav/WebdavEntry.java
@@ -23,7 +23,7 @@ import org.apache.jackrabbit.webdav.property.DavProperty;
 import org.apache.jackrabbit.webdav.property.DavPropertyName;
 import org.apache.jackrabbit.webdav.property.DavPropertySet;
 
-import com.owncloud.android.Log_OC;
+import de.mobilcom.debitel.cloud.android.Log_OC;
 
 import android.net.Uri;
 
diff --git a/tests/.classpath b/tests/.classpath
index 2731f9c5..657a459b 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -4,6 +4,7 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/owncloud-android"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 8c613c20..f78829df 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.owncloud.android.test"
+          package="de.mobilcom.debitel.cloud.androidcloud.android.test"
           android:versionCode="1"
           android:versionName="1.0">
     <!-- We add an application tag here just so that we can indicate that
@@ -12,10 +12,10 @@
     </application>
     <!--
     This declares that this application uses the instrumentation test runner targeting
-    the package of com.owncloud.android.test.  To run the tests use the command:
-    "adb shell am instrument -w com.owncloud.android.tests/android.test.InstrumentationTestRunner"
+    thde.mobilcom.debitel.cloud.androidlcom.debitel.cloud.android.test.  To run the tests use the command:
+    "ade.mobilcom.debitel.cloud.androidnt -w de.mobilcom.debitel.cloud.android.tests/android.test.InstrumentationTestRunner"
     -->
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.owncloud.android"
-                     android:label="Tests for com.owncloud.android"/>
+     android:targetPackage="de.mobilcom.debitel.cloud.android"
+     android:label="Tests for de.mobilcom.debitel.cloud.android"/>
 </manifest>
diff --git a/tests/src/com/owncloud/android/test/AccountUtilsTest.java b/tests/src/com/owncloud/android/test/AccountUtilsTest.java
deleted file mode 100644
index 51030a55..00000000
--- a/tests/src/com/owncloud/android/test/AccountUtilsTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ownCloud Android client application
- *   Copyright (C) 2012  Bartek Przybylski
- *   Copyright (C) 2012-2013 ownCloud Inc.
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.owncloud.android.test;
-
-import android.test.AndroidTestCase;
-
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.utils.OwnCloudVersion;
-
-public class AccountUtilsTest extends AndroidTestCase {
-    
-    public void testGetWebdavPathAndOCVersion() {
-        OwnCloudVersion ocv12 = new OwnCloudVersion(0x010200);
-        OwnCloudVersion ocv12s = new OwnCloudVersion("1.2");
-        OwnCloudVersion ocv22 = new OwnCloudVersion(0x020200);
-        OwnCloudVersion ocv30 = new OwnCloudVersion(0x030000);
-        OwnCloudVersion ocv33s = new OwnCloudVersion("3.3.3");
-        OwnCloudVersion ocv45 = new OwnCloudVersion(0x040500);
-        OwnCloudVersion ocv70 = new OwnCloudVersion(0x070000);
-
-        assertTrue(AccountUtils.getWebdavPath(ocv12, false).equals("/webdav/owncloud.php"));
-        assertTrue(AccountUtils.getWebdavPath(ocv12s, false).equals("/webdav/owncloud.php"));
-        assertTrue(AccountUtils.getWebdavPath(ocv22, false).equals("/files/webdav.php"));
-        assertTrue(AccountUtils.getWebdavPath(ocv30,false).equals("/files/webdav.php"));
-        assertTrue(AccountUtils.getWebdavPath(ocv33s, false).equals("/files/webdav.php"));
-        assertTrue(AccountUtils.getWebdavPath(ocv45, false).equals("/remote.php/webdav"));
-        assertTrue(AccountUtils.getWebdavPath(ocv70, false).equals("/remote.php/webdav"));
-        assertNull(AccountUtils.getWebdavPath(null, false));
-        assertTrue(AccountUtils.getWebdavPath(ocv12, true).equals("/remote.php/odav"));
-        assertTrue(AccountUtils.getWebdavPath(ocv12s, true).equals("/remote.php/odav"));
-        assertTrue(AccountUtils.getWebdavPath(ocv22, true).equals("/remote.php/odav"));
-        assertTrue(AccountUtils.getWebdavPath(ocv30, true).equals("/remote.php/odav"));
-        assertTrue(AccountUtils.getWebdavPath(ocv33s, true).equals("/remote.php/odav"));
-        assertTrue(AccountUtils.getWebdavPath(ocv45, true).equals("/remote.php/odav"));
-        assertTrue(AccountUtils.getWebdavPath(ocv70, true).equals("/remote.php/odav"));
-
-        OwnCloudVersion invalidVer = new OwnCloudVersion("a.b.c");
-        assertFalse(invalidVer.isVersionValid());
-
-        assertTrue(ocv45.toString().equals("4.5.0"));
-    }
-
-}
diff --git a/tests/src/de/mobilcom/debitel/cloud/android/test/AccountUtilsTest.java b/tests/src/de/mobilcom/debitel/cloud/android/test/AccountUtilsTest.java
new file mode 100644
index 00000000..976b3b32
--- /dev/null
+++ b/tests/src/de/mobilcom/debitel/cloud/android/test/AccountUtilsTest.java
@@ -0,0 +1,59 @@
+/* ownCloud Android client application
+ *   Copyright (C) 2012  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package de.mobilcom.debitel.cloud.android.test;
+
+import android.test.AndroidTestCase;
+
+import de.mobilcom.debitel.cloud.android.authentication.AccountUtils;
+import de.mobilcom.debitel.cloud.android.utils.OwnCloudVersion;
+
+public class AccountUtilsTest extends AndroidTestCase {
+    
+    public void testGetWebdavPathAndOCVersion() {
+        OwnCloudVersion ocv12 = new OwnCloudVersion(0x010200);
+        OwnCloudVersion ocv12s = new OwnCloudVersion("1.2");
+        OwnCloudVersion ocv22 = new OwnCloudVersion(0x020200);
+        OwnCloudVersion ocv30 = new OwnCloudVersion(0x030000);
+        OwnCloudVersion ocv33s = new OwnCloudVersion("3.3.3");
+        OwnCloudVersion ocv45 = new OwnCloudVersion(0x040500);
+        OwnCloudVersion ocv70 = new OwnCloudVersion(0x070000);
+
+        assertTrue(AccountUtils.getWebdavPath(ocv12, false, false).equals("/webdav/owncloud.php"));
+        assertTrue(AccountUtils.getWebdavPath(ocv12s, false, false).equals("/webdav/owncloud.php"));
+        assertTrue(AccountUtils.getWebdavPath(ocv22, false, false).equals("/files/webdav.php"));
+        assertTrue(AccountUtils.getWebdavPath(ocv30,false, false).equals("/files/webdav.php"));
+        assertTrue(AccountUtils.getWebdavPath(ocv33s, false, false).equals("/files/webdav.php"));
+        assertTrue(AccountUtils.getWebdavPath(ocv45, false, false).equals("/remote.php/webdav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv70, false, false).equals("/remote.php/webdav"));
+        assertNull(AccountUtils.getWebdavPath(null, false, false));
+        assertTrue(AccountUtils.getWebdavPath(ocv12, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv12s, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv22, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv30, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv33s, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv45, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv70, true, false).equals("/remote.php/odav"));
+
+        OwnCloudVersion invalidVer = new OwnCloudVersion("a.b.c");
+        assertFalse(invalidVer.isVersionValid());
+
+        assertTrue(ocv45.toString().equals("4.5.0"));
+    }
+
+}
diff --git a/tests/src/com/owncloud/android/test/FileContentProviderTest.java b/tests/src/de/mobilcom/debitel/cloud/android/test/FileContentProviderTest.java
similarity index 81%
rename from tests/src/com/owncloud/android/test/FileContentProviderTest.java
rename to tests/src/de/mobilcom/debitel/cloud/android/test/FileContentProviderTest.java
index e0345e78..21daef03 100644
--- a/tests/src/com/owncloud/android/test/FileContentProviderTest.java
+++ b/tests/src/de/mobilcom/debitel/cloud/android/test/FileContentProviderTest.java
@@ -1,7 +1,7 @@
-package com.owncloud.android.test;
+package de.mobilcom.debitel.cloud.android.test;
 
-import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
-import com.owncloud.android.providers.FileContentProvider;
+import de.mobilcom.debitel.cloud.android.db.ProviderMeta.ProviderTableMeta;
+import de.mobilcom.debitel.cloud.android.providers.FileContentProvider;
 
 import android.annotation.TargetApi;
 import android.net.Uri;
@@ -24,7 +24,7 @@ public class FileContentProviderTest extends ProviderTestCase2<FileContentProvid
 	}
 	
 	public FileContentProviderTest() {
-		super(FileContentProvider.class, "com.owncloud.android.providers.FileContentProvider");
+		super(FileContentProvider.class, "de.mobilcom.debitel.cloud.android.providers.FileContentProvider");
 	}
 	
 	@Override
-- 
2.11.0