diff --git a/README.md b/README.md
index 2f047a0a..4e2cac40 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Maven:
 
 ## Usage
 
-See e.g. [JavaShowcase](fints4k/src/test/java/net/dankito/fints/java/JavaShowcase.java) or [FinTsClientTest](fints4k/src/test/kotlin/net/dankito/fints/FinTsClientTest.kt).
+See e.g. [JavaShowcase](fints4k/src/test/java/net/dankito/banking/fints/JavaShowcase.java) or [FinTsClientTest](fints4k/src/test/kotlin/net/dankito/banking/fints/FinTsClientTest.kt).
 
 ```java
     // Set your bank code (Bankleitzahl) here.
diff --git a/fints4k/src/test/java/net/dankito/banking/fints/JavaShowcase.java b/fints4k/src/test/java/net/dankito/banking/fints/JavaShowcase.java
index 2aa020e6..f7863794 100644
--- a/fints4k/src/test/java/net/dankito/banking/fints/JavaShowcase.java
+++ b/fints4k/src/test/java/net/dankito/banking/fints/JavaShowcase.java
@@ -96,7 +96,7 @@ public class JavaShowcase {
                 @Override
                 public EnterTanResult enterTan(CustomerData customer, TanChallenge tanChallenge) {
                     // e.g. show
-                    // - Android: net.dankito.banking.fints4java.android.ui.dialogs.EnterTanDialog
+                    // - Android: net.dankito.banking.ui.android.dialogs.EnterTanDialog
                     // - JavaFX: net.dankito.banking.ui.javafx.dialogs.tan.EnterTanDialog
                     return EnterTanResult.Companion.userDidNotEnterTan(); // user did not enter TAN. aborts operation
                 }
@@ -104,7 +104,7 @@ public class JavaShowcase {
                 @Override
                 public EnterTanGeneratorAtcResult enterTanGeneratorAtc(CustomerData customer, TanGeneratorTanMedium tanMedium) {
                     // needed only in rare cases to synchronize TAN generator for chipTAN procedures. E.g. show
-                    // - Android: net.dankito.banking.fints4java.android.ui.dialogs.EnterAtcDialog
+                    // - Android: net.dankito.banking.ui.android.dialogs.EnterAtcDialog
                     return EnterTanGeneratorAtcResult.Companion.userDidNotEnterAtc(); // user did not enter TAN and ATC. aborts operation
                 }
             };
diff --git a/ui/BankingAndroidApp/src/main/AndroidManifest.xml b/ui/BankingAndroidApp/src/main/AndroidManifest.xml
index 201b64b9..e5795f4a 100644
--- a/ui/BankingAndroidApp/src/main/AndroidManifest.xml
+++ b/ui/BankingAndroidApp/src/main/AndroidManifest.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="net.dankito.banking.fints4java.android">
+        package="net.dankito.banking.ui.android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
 
     <application
-        android:name=".BankingApp"
+        android:name="net.dankito.banking.ui.android.BankingApp"
         android:testOnly="false"
         android:allowBackup="true"
         android:icon="@drawable/app_icon"
@@ -15,7 +15,7 @@
         android:theme="@style/AppTheme">
 
         <activity
-            android:name=".MainActivity"
+            android:name="net.dankito.banking.ui.android.MainActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
 
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/BankingApp.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/BankingApp.kt
similarity index 61%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/BankingApp.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/BankingApp.kt
index 1322e209..0f7154b8 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/BankingApp.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/BankingApp.kt
@@ -1,9 +1,9 @@
-package net.dankito.banking.fints4java.android
+package net.dankito.banking.ui.android
 
 import android.app.Application
-import net.dankito.banking.fints4java.android.di.BankingComponent
-import net.dankito.banking.fints4java.android.di.BankingModule
-import net.dankito.banking.fints4java.android.di.DaggerBankingComponent
+import net.dankito.banking.ui.android.di.BankingComponent
+import net.dankito.banking.ui.android.di.BankingModule
+import net.dankito.banking.ui.android.di.DaggerBankingComponent
 
 
 class BankingApp : Application() {
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/MainActivity.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/MainActivity.kt
similarity index 88%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/MainActivity.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/MainActivity.kt
index 366d0db2..cd4db731 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/MainActivity.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/MainActivity.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android
+package net.dankito.banking.ui.android
 
 import android.os.Bundle
 import android.view.Menu
@@ -8,11 +8,11 @@ import androidx.appcompat.widget.Toolbar
 import androidx.drawerlayout.widget.DrawerLayout
 import com.github.clans.fab.FloatingActionMenu
 import kotlinx.android.synthetic.main.activity_main.*
-import net.dankito.banking.fints4java.android.di.BankingComponent
-import net.dankito.banking.fints4java.android.di.BankingModule
-import net.dankito.banking.fints4java.android.ui.activities.BaseActivity
-import net.dankito.banking.fints4java.android.ui.views.DrawerView
-import net.dankito.banking.fints4java.android.ui.views.MainActivityFloatingActionMenuButton
+import net.dankito.banking.ui.android.di.BankingComponent
+import net.dankito.banking.ui.android.di.BankingModule
+import net.dankito.banking.ui.android.activities.BaseActivity
+import net.dankito.banking.ui.android.views.DrawerView
+import net.dankito.banking.ui.android.views.MainActivityFloatingActionMenuButton
 import net.dankito.banking.ui.presenter.BankingPresenter
 import javax.inject.Inject
 
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/RouterAndroid.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/RouterAndroid.kt
similarity index 93%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/RouterAndroid.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/RouterAndroid.kt
index ae3baf28..07591dee 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/RouterAndroid.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/RouterAndroid.kt
@@ -1,8 +1,8 @@
-package net.dankito.banking.fints4java.android
+package net.dankito.banking.ui.android
 
-import net.dankito.banking.fints4java.android.ui.dialogs.*
-import net.dankito.banking.fints4java.android.ui.util.CurrentActivityTracker
+import net.dankito.banking.ui.android.util.CurrentActivityTracker
 import net.dankito.banking.ui.IRouter
+import net.dankito.banking.ui.android.dialogs.*
 import net.dankito.banking.ui.model.Account
 import net.dankito.banking.ui.model.BankAccount
 import net.dankito.banking.ui.model.parameters.TransferMoneyData
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/activities/BaseActivity.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/activities/BaseActivity.kt
similarity index 85%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/activities/BaseActivity.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/activities/BaseActivity.kt
index e7752960..e6c79e0d 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/activities/BaseActivity.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/activities/BaseActivity.kt
@@ -1,9 +1,9 @@
-package net.dankito.banking.fints4java.android.ui.activities
+package net.dankito.banking.ui.android.activities
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import net.dankito.banking.fints4java.android.di.BankingComponent
-import net.dankito.banking.fints4java.android.ui.util.CurrentActivityTracker
+import net.dankito.banking.ui.android.di.BankingComponent
+import net.dankito.banking.ui.android.util.CurrentActivityTracker
 import org.slf4j.LoggerFactory
 import javax.inject.Inject
 
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/AccountTransactionAdapter.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/AccountTransactionAdapter.kt
similarity index 93%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/AccountTransactionAdapter.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/AccountTransactionAdapter.kt
index 441263f1..1208a2eb 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/AccountTransactionAdapter.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/AccountTransactionAdapter.kt
@@ -1,9 +1,9 @@
-package net.dankito.banking.fints4java.android.ui.adapter
+package net.dankito.banking.ui.android.adapter
 
 import android.view.ContextMenu
 import android.view.View
-import net.dankito.banking.fints4java.android.R
-import net.dankito.banking.fints4java.android.ui.adapter.viewholder.AccountTransactionViewHolder
+import net.dankito.banking.ui.android.R
+import net.dankito.banking.ui.android.adapter.viewholder.AccountTransactionViewHolder
 import net.dankito.banking.ui.model.AccountTransaction
 import net.dankito.banking.ui.presenter.BankingPresenter
 import net.dankito.utils.android.extensions.asActivity
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/BankAccountsAdapter.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/BankAccountsAdapter.kt
similarity index 89%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/BankAccountsAdapter.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/BankAccountsAdapter.kt
index 26e9b26f..6c0c075e 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/BankAccountsAdapter.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/BankAccountsAdapter.kt
@@ -1,11 +1,11 @@
-package net.dankito.banking.fints4java.android.ui.adapter
+package net.dankito.banking.ui.android.adapter
 
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import kotlinx.android.synthetic.main.list_item_bank_account.view.*
-import net.dankito.banking.fints4java.android.R
+import net.dankito.banking.ui.android.R
 import net.dankito.banking.ui.model.BankAccount
 import net.dankito.utils.android.ui.adapter.ListAdapter
 
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/BankListAdapter.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/BankListAdapter.kt
similarity index 87%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/BankListAdapter.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/BankListAdapter.kt
index 3efa008e..093e7473 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/BankListAdapter.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/BankListAdapter.kt
@@ -1,8 +1,8 @@
-package net.dankito.banking.fints4java.android.ui.adapter
+package net.dankito.banking.ui.android.adapter
 
 import android.view.View
-import net.dankito.banking.fints4java.android.R
-import net.dankito.banking.fints4java.android.ui.adapter.viewholder.BankInfoViewHolder
+import net.dankito.banking.ui.android.R
+import net.dankito.banking.ui.android.adapter.viewholder.BankInfoViewHolder
 import net.dankito.banking.fints.model.BankInfo
 import net.dankito.utils.android.extensions.setTintColor
 import net.dankito.utils.android.ui.adapter.ListRecyclerAdapter
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/RemitteeListAdapter.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/RemitteeListAdapter.kt
similarity index 79%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/RemitteeListAdapter.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/RemitteeListAdapter.kt
index 67077386..6e3e0069 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/RemitteeListAdapter.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/RemitteeListAdapter.kt
@@ -1,8 +1,8 @@
-package net.dankito.banking.fints4java.android.ui.adapter
+package net.dankito.banking.ui.android.adapter
 
 import android.view.View
-import net.dankito.banking.fints4java.android.R
-import net.dankito.banking.fints4java.android.ui.adapter.viewholder.RemitteeViewHolder
+import net.dankito.banking.ui.android.R
+import net.dankito.banking.ui.android.adapter.viewholder.RemitteeViewHolder
 import net.dankito.banking.search.Remittee
 import net.dankito.utils.android.ui.adapter.ListRecyclerAdapter
 
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/TanMediumAdapter.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/TanMediumAdapter.kt
similarity index 87%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/TanMediumAdapter.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/TanMediumAdapter.kt
index a7da8551..de02b008 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/TanMediumAdapter.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/TanMediumAdapter.kt
@@ -1,9 +1,9 @@
-package net.dankito.banking.fints4java.android.ui.adapter
+package net.dankito.banking.ui.android.adapter
 
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
-import net.dankito.banking.fints4java.android.R
+import net.dankito.banking.ui.android.R
 import net.dankito.banking.ui.model.tan.TanMedium
 import net.dankito.utils.android.extensions.asActivity
 import net.dankito.utils.android.ui.adapter.ListAdapter
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/TanProceduresAdapter.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/TanProceduresAdapter.kt
similarity index 87%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/TanProceduresAdapter.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/TanProceduresAdapter.kt
index 6816b0ad..1e137181 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/TanProceduresAdapter.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/TanProceduresAdapter.kt
@@ -1,9 +1,9 @@
-package net.dankito.banking.fints4java.android.ui.adapter
+package net.dankito.banking.ui.android.adapter
 
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
-import net.dankito.banking.fints4java.android.R
+import net.dankito.banking.ui.android.R
 import net.dankito.banking.ui.model.tan.TanProcedure
 import net.dankito.utils.android.extensions.asActivity
 import net.dankito.utils.android.ui.adapter.ListAdapter
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/presenter/BankInfoPresenter.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/presenter/BankInfoPresenter.kt
similarity index 87%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/presenter/BankInfoPresenter.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/presenter/BankInfoPresenter.kt
index 377a41ba..48151dda 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/presenter/BankInfoPresenter.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/presenter/BankInfoPresenter.kt
@@ -1,10 +1,10 @@
-package net.dankito.banking.fints4java.android.ui.adapter.presenter
+package net.dankito.banking.ui.android.adapter.presenter
 
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
 import com.otaliastudios.autocomplete.RecyclerViewPresenter
 import kotlinx.coroutines.*
-import net.dankito.banking.fints4java.android.ui.adapter.BankListAdapter
+import net.dankito.banking.ui.android.adapter.BankListAdapter
 import net.dankito.banking.ui.presenter.BankingPresenter
 import net.dankito.banking.fints.model.BankInfo
 
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/presenter/RemitteePresenter.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/presenter/RemitteePresenter.kt
similarity index 88%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/presenter/RemitteePresenter.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/presenter/RemitteePresenter.kt
index a574711d..0895fe62 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/presenter/RemitteePresenter.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/presenter/RemitteePresenter.kt
@@ -1,10 +1,10 @@
-package net.dankito.banking.fints4java.android.ui.adapter.presenter
+package net.dankito.banking.ui.android.adapter.presenter
 
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
 import com.otaliastudios.autocomplete.RecyclerViewPresenter
 import kotlinx.coroutines.*
-import net.dankito.banking.fints4java.android.ui.adapter.RemitteeListAdapter
+import net.dankito.banking.ui.android.adapter.RemitteeListAdapter
 import net.dankito.banking.search.IRemitteeSearcher
 import net.dankito.banking.search.Remittee
 import net.dankito.utils.Stopwatch
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/viewholder/AccountTransactionViewHolder.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/viewholder/AccountTransactionViewHolder.kt
similarity index 90%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/viewholder/AccountTransactionViewHolder.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/viewholder/AccountTransactionViewHolder.kt
index ea417e5c..bb082e21 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/viewholder/AccountTransactionViewHolder.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/viewholder/AccountTransactionViewHolder.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.adapter.viewholder
+package net.dankito.banking.ui.android.adapter.viewholder
 
 import android.view.View
 import android.widget.TextView
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/viewholder/BankInfoViewHolder.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/viewholder/BankInfoViewHolder.kt
similarity index 88%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/viewholder/BankInfoViewHolder.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/viewholder/BankInfoViewHolder.kt
index 89a9726d..b19ad1a3 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/viewholder/BankInfoViewHolder.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/viewholder/BankInfoViewHolder.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.adapter.viewholder
+package net.dankito.banking.ui.android.adapter.viewholder
 
 import android.view.View
 import android.widget.ImageView
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/viewholder/RemitteeViewHolder.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/viewholder/RemitteeViewHolder.kt
similarity index 85%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/viewholder/RemitteeViewHolder.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/viewholder/RemitteeViewHolder.kt
index 3b9af45e..0d30644e 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/viewholder/RemitteeViewHolder.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/adapter/viewholder/RemitteeViewHolder.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.adapter.viewholder
+package net.dankito.banking.ui.android.adapter.viewholder
 
 import android.view.View
 import android.widget.TextView
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/di/BankingComponent.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/di/BankingComponent.kt
similarity index 51%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/di/BankingComponent.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/di/BankingComponent.kt
index c62dc29c..8ee28f5d 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/di/BankingComponent.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/di/BankingComponent.kt
@@ -1,13 +1,13 @@
-package net.dankito.banking.fints4java.android.di
+package net.dankito.banking.ui.android.di
 
 import dagger.Component
-import net.dankito.banking.fints4java.android.MainActivity
-import net.dankito.banking.fints4java.android.ui.activities.BaseActivity
-import net.dankito.banking.fints4java.android.ui.dialogs.AddAccountDialog
-import net.dankito.banking.fints4java.android.ui.dialogs.EnterTanDialog
-import net.dankito.banking.fints4java.android.ui.dialogs.SendMessageLogDialog
-import net.dankito.banking.fints4java.android.ui.dialogs.TransferMoneyDialog
-import net.dankito.banking.fints4java.android.ui.home.HomeFragment
+import net.dankito.banking.ui.android.MainActivity
+import net.dankito.banking.ui.android.activities.BaseActivity
+import net.dankito.banking.ui.android.dialogs.AddAccountDialog
+import net.dankito.banking.ui.android.dialogs.EnterTanDialog
+import net.dankito.banking.ui.android.dialogs.SendMessageLogDialog
+import net.dankito.banking.ui.android.dialogs.TransferMoneyDialog
+import net.dankito.banking.ui.android.home.HomeFragment
 import javax.inject.Singleton
 
 
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/di/BankingModule.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/di/BankingModule.kt
similarity index 94%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/di/BankingModule.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/di/BankingModule.kt
index deb459c8..cc2d073a 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/di/BankingModule.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/di/BankingModule.kt
@@ -1,12 +1,12 @@
-package net.dankito.banking.fints4java.android.di
+package net.dankito.banking.ui.android.di
 
 import android.content.Context
 import androidx.appcompat.app.AppCompatActivity
 import dagger.Module
 import dagger.Provides
-import net.dankito.banking.fints4java.android.RouterAndroid
-import net.dankito.banking.fints4java.android.ui.util.CurrentActivityTracker
-import net.dankito.banking.fints4java.android.util.Base64ServiceAndroid
+import net.dankito.banking.ui.android.RouterAndroid
+import net.dankito.banking.ui.android.util.CurrentActivityTracker
+import net.dankito.banking.ui.android.util.Base64ServiceAndroid
 import net.dankito.banking.fints4kBankingClientCreator
 import net.dankito.banking.persistence.IBankingPersistence
 import net.dankito.banking.persistence.LuceneBankingPersistence
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/AddAccountDialog.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/AddAccountDialog.kt
similarity index 93%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/AddAccountDialog.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/AddAccountDialog.kt
index 9d2b518b..bd7a40ae 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/AddAccountDialog.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/AddAccountDialog.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.dialogs
+package net.dankito.banking.ui.android.dialogs
 
 import android.content.Context
 import android.content.DialogInterface
@@ -18,16 +18,15 @@ import androidx.fragment.app.DialogFragment
 import com.otaliastudios.autocomplete.Autocomplete
 import kotlinx.android.synthetic.main.dialog_add_account.*
 import kotlinx.android.synthetic.main.dialog_add_account.view.*
-import net.dankito.banking.fints4java.android.R
-import net.dankito.banking.fints4java.android.di.BankingComponent
-import net.dankito.banking.fints4java.android.ui.adapter.presenter.BankInfoPresenter
-import net.dankito.banking.fints4java.android.ui.extensions.addEnterPressedListener
-import net.dankito.banking.fints4java.android.ui.extensions.closePopupOnBackButtonPress
-import net.dankito.banking.fints4java.android.util.StandardAutocompleteCallback
+import net.dankito.banking.ui.android.R
+import net.dankito.banking.ui.android.di.BankingComponent
+import net.dankito.banking.ui.android.adapter.presenter.BankInfoPresenter
+import net.dankito.banking.ui.android.extensions.addEnterPressedListener
+import net.dankito.banking.ui.android.extensions.closePopupOnBackButtonPress
+import net.dankito.banking.ui.android.util.StandardAutocompleteCallback
 import net.dankito.banking.ui.model.responses.AddAccountResponse
 import net.dankito.banking.ui.presenter.BankingPresenter
 import net.dankito.banking.fints.model.BankInfo
-import net.dankito.utils.Stopwatch
 import net.dankito.utils.android.extensions.asActivity
 import javax.inject.Inject
 
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterAtcDialog.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/EnterAtcDialog.kt
similarity index 96%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterAtcDialog.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/EnterAtcDialog.kt
index 7f0a196b..7967e365 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterAtcDialog.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/EnterAtcDialog.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.dialogs
+package net.dankito.banking.ui.android.dialogs
 
 import android.os.Bundle
 import android.text.Html
@@ -9,7 +9,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.DialogFragment
 import kotlinx.android.synthetic.main.dialog_enter_atc.view.*
-import net.dankito.banking.fints4java.android.R
+import net.dankito.banking.ui.android.R
 import net.dankito.banking.ui.model.tan.EnterTanGeneratorAtcResult
 import net.dankito.banking.ui.model.tan.TanMedium
 
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterTanDialog.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/EnterTanDialog.kt
similarity index 95%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterTanDialog.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/EnterTanDialog.kt
index e7225f91..47e45669 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterTanDialog.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/EnterTanDialog.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.dialogs
+package net.dankito.banking.ui.android.dialogs
 
 import android.content.Context
 import android.graphics.BitmapFactory
@@ -15,11 +15,11 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.DialogFragment
 import kotlinx.android.synthetic.main.dialog_enter_tan.view.*
 import kotlinx.android.synthetic.main.view_tan_image.view.*
-import net.dankito.banking.fints4java.android.R
-import net.dankito.banking.fints4java.android.di.BankingComponent
-import net.dankito.banking.fints4java.android.ui.adapter.TanMediumAdapter
-import net.dankito.banking.fints4java.android.ui.adapter.TanProceduresAdapter
-import net.dankito.banking.fints4java.android.ui.listener.ListItemSelectedListener
+import net.dankito.banking.ui.android.R
+import net.dankito.banking.ui.android.di.BankingComponent
+import net.dankito.banking.ui.android.adapter.TanMediumAdapter
+import net.dankito.banking.ui.android.adapter.TanProceduresAdapter
+import net.dankito.banking.ui.android.listener.ListItemSelectedListener
 import net.dankito.banking.ui.model.Account
 import net.dankito.banking.ui.model.responses.BankingClientResponse
 import net.dankito.banking.ui.model.tan.*
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/SendMessageLogDialog.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/SendMessageLogDialog.kt
similarity index 94%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/SendMessageLogDialog.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/SendMessageLogDialog.kt
index e99b9178..e35cf48d 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/SendMessageLogDialog.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/SendMessageLogDialog.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.dialogs
+package net.dankito.banking.ui.android.dialogs
 
 import android.content.ActivityNotFoundException
 import android.content.Intent
@@ -10,8 +10,8 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.DialogFragment
 import kotlinx.android.synthetic.main.dialog_send_message_log.view.*
-import net.dankito.banking.fints4java.android.R
-import net.dankito.banking.fints4java.android.di.BankingComponent
+import net.dankito.banking.ui.android.R
+import net.dankito.banking.ui.android.di.BankingComponent
 import net.dankito.banking.ui.presenter.BankingPresenter
 import javax.inject.Inject
 
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/TransferMoneyDialog.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/TransferMoneyDialog.kt
similarity index 95%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/TransferMoneyDialog.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/TransferMoneyDialog.kt
index bfb8b358..e96ace5b 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/TransferMoneyDialog.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/TransferMoneyDialog.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.dialogs
+package net.dankito.banking.ui.android.dialogs
 
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
@@ -15,15 +15,15 @@ import androidx.fragment.app.DialogFragment
 import com.otaliastudios.autocomplete.Autocomplete
 import kotlinx.android.synthetic.main.dialog_transfer_money.*
 import kotlinx.android.synthetic.main.dialog_transfer_money.view.*
-import net.dankito.banking.fints4java.android.R
-import net.dankito.banking.fints4java.android.di.BankingComponent
-import net.dankito.banking.fints4java.android.ui.adapter.BankAccountsAdapter
-import net.dankito.banking.fints4java.android.ui.adapter.presenter.RemitteePresenter
-import net.dankito.banking.fints4java.android.ui.extensions.addEnterPressedListener
-import net.dankito.banking.fints4java.android.ui.extensions.closePopupOnBackButtonPress
-import net.dankito.banking.fints4java.android.ui.listener.ListItemSelectedListener
-import net.dankito.banking.fints4java.android.util.StandardAutocompleteCallback
-import net.dankito.banking.fints4java.android.util.StandardTextWatcher
+import net.dankito.banking.ui.android.R
+import net.dankito.banking.ui.android.di.BankingComponent
+import net.dankito.banking.ui.android.adapter.BankAccountsAdapter
+import net.dankito.banking.ui.android.adapter.presenter.RemitteePresenter
+import net.dankito.banking.ui.android.extensions.addEnterPressedListener
+import net.dankito.banking.ui.android.extensions.closePopupOnBackButtonPress
+import net.dankito.banking.ui.android.listener.ListItemSelectedListener
+import net.dankito.banking.ui.android.util.StandardAutocompleteCallback
+import net.dankito.banking.ui.android.util.StandardTextWatcher
 import net.dankito.banking.search.IRemitteeSearcher
 import net.dankito.banking.search.Remittee
 import net.dankito.banking.ui.model.BankAccount
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/extensions/AutocompleteExtensions.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/extensions/AutocompleteExtensions.kt
similarity index 91%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/extensions/AutocompleteExtensions.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/extensions/AutocompleteExtensions.kt
index 8ef1b7c4..9b764549 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/extensions/AutocompleteExtensions.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/extensions/AutocompleteExtensions.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.extensions
+package net.dankito.banking.ui.android.extensions
 
 import android.app.Dialog
 import android.view.KeyEvent
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/extensions/EditTextExtensions.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/extensions/EditTextExtensions.kt
similarity index 84%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/extensions/EditTextExtensions.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/extensions/EditTextExtensions.kt
index 4117a473..162c65aa 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/extensions/EditTextExtensions.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/extensions/EditTextExtensions.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.extensions
+package net.dankito.banking.ui.android.extensions
 
 import android.view.KeyEvent
 import android.widget.EditText
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/extensions/IDrawerItemExtensions.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/extensions/IDrawerItemExtensions.kt
similarity index 91%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/extensions/IDrawerItemExtensions.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/extensions/IDrawerItemExtensions.kt
index a2f97271..53e9106e 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/extensions/IDrawerItemExtensions.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/extensions/IDrawerItemExtensions.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.extensions
+package net.dankito.banking.ui.android.extensions
 
 import android.content.Context
 import com.mikepenz.iconics.typeface.IIcon
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/home/HomeFragment.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/home/HomeFragment.kt
similarity index 96%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/home/HomeFragment.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/home/HomeFragment.kt
index 7bea2074..94a112cc 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/home/HomeFragment.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/home/HomeFragment.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.home
+package net.dankito.banking.ui.android.home
 
 import android.app.SearchManager
 import android.content.Context
@@ -12,9 +12,9 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import net.dankito.banking.fints4java.android.R
-import net.dankito.banking.fints4java.android.di.BankingComponent
-import net.dankito.banking.fints4java.android.ui.adapter.AccountTransactionAdapter
+import net.dankito.banking.ui.android.R
+import net.dankito.banking.ui.android.di.BankingComponent
+import net.dankito.banking.ui.android.adapter.AccountTransactionAdapter
 import net.dankito.banking.ui.model.AccountTransaction
 import net.dankito.banking.ui.model.parameters.TransferMoneyData
 import net.dankito.banking.ui.model.responses.GetTransactionsResponse
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/home/HomeViewModel.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/home/HomeViewModel.kt
similarity index 84%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/home/HomeViewModel.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/home/HomeViewModel.kt
index 63d4eb7d..75bd4009 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/home/HomeViewModel.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/home/HomeViewModel.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.home
+package net.dankito.banking.ui.android.home
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/listener/ItemSelectedListener.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/listener/ItemSelectedListener.kt
similarity index 86%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/listener/ItemSelectedListener.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/listener/ItemSelectedListener.kt
index 738a923a..f61d348f 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/listener/ItemSelectedListener.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/listener/ItemSelectedListener.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.listener
+package net.dankito.banking.ui.android.listener
 
 import android.view.View
 import android.widget.AdapterView
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/listener/ListItemSelectedListener.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/listener/ListItemSelectedListener.kt
similarity index 88%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/listener/ListItemSelectedListener.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/listener/ListItemSelectedListener.kt
index 756368ca..60db4616 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/listener/ListItemSelectedListener.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/listener/ListItemSelectedListener.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.listener
+package net.dankito.banking.ui.android.listener
 
 import android.view.View
 import android.widget.AdapterView
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/util/Base64ServiceAndroid.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/util/Base64ServiceAndroid.kt
similarity index 90%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/util/Base64ServiceAndroid.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/util/Base64ServiceAndroid.kt
index 75f987c9..58f7e38a 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/util/Base64ServiceAndroid.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/util/Base64ServiceAndroid.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.util
+package net.dankito.banking.ui.android.util
 
 import android.util.Base64
 import net.dankito.banking.util.IBase64Service
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/util/CurrentActivityTracker.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/util/CurrentActivityTracker.kt
similarity index 91%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/util/CurrentActivityTracker.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/util/CurrentActivityTracker.kt
index ed278b27..a3e7136a 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/util/CurrentActivityTracker.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/util/CurrentActivityTracker.kt
@@ -1,6 +1,6 @@
-package net.dankito.banking.fints4java.android.ui.util
+package net.dankito.banking.ui.android.util
 
-import net.dankito.banking.fints4java.android.ui.activities.BaseActivity
+import net.dankito.banking.ui.android.activities.BaseActivity
 import java.util.*
 import java.util.concurrent.CopyOnWriteArrayList
 import kotlin.concurrent.schedule
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/util/StandardAutocompleteCallback.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/util/StandardAutocompleteCallback.kt
similarity index 91%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/util/StandardAutocompleteCallback.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/util/StandardAutocompleteCallback.kt
index 3e6a15f3..99a38a69 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/util/StandardAutocompleteCallback.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/util/StandardAutocompleteCallback.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.util
+package net.dankito.banking.ui.android.util
 
 import android.text.Editable
 import com.otaliastudios.autocomplete.AutocompleteCallback
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/util/StandardTextWatcher.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/util/StandardTextWatcher.kt
similarity index 95%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/util/StandardTextWatcher.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/util/StandardTextWatcher.kt
index 9cbe8ce5..83c69886 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/util/StandardTextWatcher.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/util/StandardTextWatcher.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.util
+package net.dankito.banking.ui.android.util
 
 import android.text.Editable
 import android.text.TextWatcher
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/AccountDrawerItem.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/AccountDrawerItem.kt
similarity index 57%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/AccountDrawerItem.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/AccountDrawerItem.kt
index 1935d5bd..2fb24a08 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/AccountDrawerItem.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/AccountDrawerItem.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.views
+package net.dankito.banking.ui.android.views
 
 
 class AccountDrawerItem : SecondaryIconDrawerItem<AccountDrawerItem>() {
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/ChipTanFlickerCodeStripeView.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeStripeView.kt
similarity index 94%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/ChipTanFlickerCodeStripeView.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeStripeView.kt
index 32f6523a..516043af 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/ChipTanFlickerCodeStripeView.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeStripeView.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.views
+package net.dankito.banking.ui.android.views
 
 import android.content.Context
 import android.graphics.Color
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/ChipTanFlickerCodeView.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeView.kt
similarity index 98%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/ChipTanFlickerCodeView.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeView.kt
index 3b72ae7a..5a6855da 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/ChipTanFlickerCodeView.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/ChipTanFlickerCodeView.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.views
+package net.dankito.banking.ui.android.views
 
 import android.content.Context
 import android.util.AttributeSet
@@ -8,7 +8,7 @@ import android.widget.ImageButton
 import android.widget.LinearLayout
 import kotlinx.android.synthetic.main.view_flicker_code.view.*
 import kotlinx.android.synthetic.main.view_tan_image_size_controls.view.*
-import net.dankito.banking.fints4java.android.R
+import net.dankito.banking.ui.android.R
 import net.dankito.banking.ui.model.tan.FlickerCode
 import net.dankito.banking.ui.util.FlickerCodeAnimator
 import net.dankito.banking.fints.tan.Bit
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/DrawerView.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/DrawerView.kt
similarity index 97%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/DrawerView.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/DrawerView.kt
index 4069a75f..6b3cd608 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/DrawerView.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/DrawerView.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.views
+package net.dankito.banking.ui.android.views
 
 import android.view.View
 import android.widget.TextView
@@ -18,8 +18,8 @@ import com.mikepenz.materialdrawer.util.addItemsAtPosition
 import com.mikepenz.materialdrawer.util.getDrawerItem
 import com.mikepenz.materialdrawer.util.removeItemByPosition
 import com.mikepenz.materialdrawer.widget.MaterialDrawerSliderView
-import net.dankito.banking.fints4java.android.R
-import net.dankito.banking.fints4java.android.ui.extensions.withIcon
+import net.dankito.banking.ui.android.R
+import net.dankito.banking.ui.android.extensions.withIcon
 import net.dankito.banking.ui.model.Account
 import net.dankito.banking.ui.presenter.BankingPresenter
 import org.slf4j.LoggerFactory
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/FloatingActionMenuButton.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/FloatingActionMenuButton.kt
similarity index 97%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/FloatingActionMenuButton.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/FloatingActionMenuButton.kt
index ab9f15a2..a80f5a86 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/FloatingActionMenuButton.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/FloatingActionMenuButton.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.views
+package net.dankito.banking.ui.android.views
 
 import android.os.Bundle
 import android.view.MotionEvent
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/MainActivityFloatingActionMenuButton.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/MainActivityFloatingActionMenuButton.kt
similarity index 96%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/MainActivityFloatingActionMenuButton.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/MainActivityFloatingActionMenuButton.kt
index 1dcdfdf0..d318e667 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/MainActivityFloatingActionMenuButton.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/MainActivityFloatingActionMenuButton.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.views
+package net.dankito.banking.ui.android.views
 
 import androidx.appcompat.app.AppCompatActivity
 import com.github.clans.fab.FloatingActionButton
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/SecondaryIconDrawerItem.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/SecondaryIconDrawerItem.kt
similarity index 97%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/SecondaryIconDrawerItem.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/SecondaryIconDrawerItem.kt
index 931ddf80..490a0c07 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/SecondaryIconDrawerItem.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/SecondaryIconDrawerItem.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.views
+package net.dankito.banking.ui.android.views
 
 import android.content.Context
 import android.content.res.ColorStateList
@@ -14,7 +14,7 @@ import com.mikepenz.materialdrawer.holder.ImageHolder
 import com.mikepenz.materialdrawer.iconics.IconicsImageHolder
 import com.mikepenz.materialdrawer.model.BaseDescribeableDrawerItem
 import com.mikepenz.materialdrawer.model.BaseViewHolder
-import net.dankito.banking.fints4java.android.R
+import net.dankito.banking.ui.android.R
 import net.dankito.utils.android.extensions.createColorStateList
 
 
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/TanImageSizeControlsView.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/TanImageSizeControlsView.kt
similarity index 84%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/TanImageSizeControlsView.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/TanImageSizeControlsView.kt
index ddcfc5bd..e0842141 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/TanImageSizeControlsView.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/TanImageSizeControlsView.kt
@@ -1,10 +1,10 @@
-package net.dankito.banking.fints4java.android.ui.views
+package net.dankito.banking.ui.android.views
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.LinearLayout
-import net.dankito.banking.fints4java.android.R
+import net.dankito.banking.ui.android.R
 
 
 open class TanImageSizeControlsView @JvmOverloads constructor(
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/TanImageView.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/TanImageView.kt
similarity index 95%
rename from ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/TanImageView.kt
rename to ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/TanImageView.kt
index 7255bc64..a90fe405 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/TanImageView.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/views/TanImageView.kt
@@ -1,4 +1,4 @@
-package net.dankito.banking.fints4java.android.ui.views
+package net.dankito.banking.ui.android.views
 
 import android.content.Context
 import android.util.AttributeSet
@@ -7,7 +7,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import kotlinx.android.synthetic.main.view_tan_image.view.*
 import kotlinx.android.synthetic.main.view_tan_image_size_controls.view.*
-import net.dankito.banking.fints4java.android.R
+import net.dankito.banking.ui.android.R
 
 
 open class TanImageView @JvmOverloads constructor(
diff --git a/ui/BankingAndroidApp/src/main/res/layout/dialog_enter_tan.xml b/ui/BankingAndroidApp/src/main/res/layout/dialog_enter_tan.xml
index 69c89594..327de283 100644
--- a/ui/BankingAndroidApp/src/main/res/layout/dialog_enter_tan.xml
+++ b/ui/BankingAndroidApp/src/main/res/layout/dialog_enter_tan.xml
@@ -68,7 +68,7 @@
 
         </LinearLayout>
 
-        <net.dankito.banking.fints4java.android.ui.views.ChipTanFlickerCodeView
+        <net.dankito.banking.ui.android.views.ChipTanFlickerCodeView
                 android:id="@+id/flickerCodeView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -76,7 +76,7 @@
                 android:visibility="gone"
         />
 
-        <net.dankito.banking.fints4java.android.ui.views.TanImageView
+        <net.dankito.banking.ui.android.views.TanImageView
                 android:id="@+id/tanImageView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/ui/BankingAndroidApp/src/main/res/layout/view_flicker_code.xml b/ui/BankingAndroidApp/src/main/res/layout/view_flicker_code.xml
index 9938c28c..5c8eee1d 100644
--- a/ui/BankingAndroidApp/src/main/res/layout/view_flicker_code.xml
+++ b/ui/BankingAndroidApp/src/main/res/layout/view_flicker_code.xml
@@ -14,7 +14,7 @@
         android:gravity="center_horizontal"
     >
 
-        <net.dankito.banking.fints4java.android.ui.views.TanImageSizeControlsView
+        <net.dankito.banking.ui.android.views.TanImageSizeControlsView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center_vertical"
@@ -106,7 +106,7 @@
                     android:gravity="center_horizontal"
                     >
 
-                    <net.dankito.banking.fints4java.android.ui.views.ChipTanFlickerCodeStripeView
+                    <net.dankito.banking.ui.android.views.ChipTanFlickerCodeStripeView
                         android:id="@+id/flickerCodeStripe1"
                         android:layout_width="@dimen/view_flicker_code_stripe_width"
                         android:layout_height="@dimen/view_flicker_code_stripe_height"
@@ -114,7 +114,7 @@
                         android:layout_marginEnd="@dimen/view_flicker_code_stripe_margin_right"
                         />
 
-                    <net.dankito.banking.fints4java.android.ui.views.ChipTanFlickerCodeStripeView
+                    <net.dankito.banking.ui.android.views.ChipTanFlickerCodeStripeView
                         android:id="@+id/flickerCodeStripe2"
                         android:layout_width="@dimen/view_flicker_code_stripe_width"
                         android:layout_height="@dimen/view_flicker_code_stripe_height"
@@ -122,7 +122,7 @@
                         android:layout_marginEnd="@dimen/view_flicker_code_stripe_margin_right"
                         />
 
-                    <net.dankito.banking.fints4java.android.ui.views.ChipTanFlickerCodeStripeView
+                    <net.dankito.banking.ui.android.views.ChipTanFlickerCodeStripeView
                         android:id="@+id/flickerCodeStripe3"
                         android:layout_width="@dimen/view_flicker_code_stripe_width"
                         android:layout_height="@dimen/view_flicker_code_stripe_height"
@@ -130,7 +130,7 @@
                         android:layout_marginEnd="@dimen/view_flicker_code_stripe_margin_right"
                         />
 
-                    <net.dankito.banking.fints4java.android.ui.views.ChipTanFlickerCodeStripeView
+                    <net.dankito.banking.ui.android.views.ChipTanFlickerCodeStripeView
                         android:id="@+id/flickerCodeStripe4"
                         android:layout_width="@dimen/view_flicker_code_stripe_width"
                         android:layout_height="@dimen/view_flicker_code_stripe_height"
@@ -138,7 +138,7 @@
                         android:layout_marginEnd="@dimen/view_flicker_code_stripe_margin_right"
                         />
 
-                    <net.dankito.banking.fints4java.android.ui.views.ChipTanFlickerCodeStripeView
+                    <net.dankito.banking.ui.android.views.ChipTanFlickerCodeStripeView
                         android:id="@+id/flickerCodeStripe5"
                         android:layout_width="@dimen/view_flicker_code_stripe_width"
                         android:layout_height="@dimen/view_flicker_code_stripe_height"
diff --git a/ui/BankingAndroidApp/src/main/res/layout/view_tan_image.xml b/ui/BankingAndroidApp/src/main/res/layout/view_tan_image.xml
index 564ca927..8bf60f67 100644
--- a/ui/BankingAndroidApp/src/main/res/layout/view_tan_image.xml
+++ b/ui/BankingAndroidApp/src/main/res/layout/view_tan_image.xml
@@ -8,7 +8,7 @@
         android:gravity="center"
 >
 
-    <net.dankito.banking.fints4java.android.ui.views.TanImageSizeControlsView
+    <net.dankito.banking.ui.android.views.TanImageSizeControlsView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
diff --git a/ui/BankingAndroidApp/src/main/res/navigation/mobile_navigation.xml b/ui/BankingAndroidApp/src/main/res/navigation/mobile_navigation.xml
index 33b7d7eb..59d5b120 100644
--- a/ui/BankingAndroidApp/src/main/res/navigation/mobile_navigation.xml
+++ b/ui/BankingAndroidApp/src/main/res/navigation/mobile_navigation.xml
@@ -7,7 +7,7 @@
 
     <fragment
             android:id="@+id/nav_home"
-            android:name="net.dankito.banking.fints4java.android.ui.home.HomeFragment"
+            android:name="net.dankito.banking.ui.android.home.HomeFragment"
             android:label="@string/menu_home"
             tools:layout="@layout/fragment_home" />