diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
index 436c91f3e..7bd5ee1fd 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
@@ -40,10 +40,9 @@ import com.nextcloud.talk.R
 import com.nextcloud.talk.controllers.CallNotificationController
 import com.nextcloud.talk.controllers.ContactsController
 import com.nextcloud.talk.controllers.LockedController
-import com.nextcloud.talk.controllers.ServerSelectionController
 import com.nextcloud.talk.controllers.base.providers.ActionBarProvider
 import com.nextcloud.talk.newarch.domain.repository.offline.UsersRepository
-import com.nextcloud.talk.newarch.features.account.ServerEntryView
+import com.nextcloud.talk.newarch.features.account.serverentry.ServerEntryView
 import com.nextcloud.talk.newarch.features.conversationsList.ConversationsListView
 import com.nextcloud.talk.newarch.local.models.UserNgEntity
 import com.nextcloud.talk.utils.ConductorRemapping
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/account/di/module/AccountModule.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/account/di/module/AccountModule.kt
index 4771ee0a0..8770a1b7b 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/account/di/module/AccountModule.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/account/di/module/AccountModule.kt
@@ -2,7 +2,7 @@ package com.nextcloud.talk.newarch.features.account.di.module
 
 import android.app.Application
 import com.nextcloud.talk.newarch.domain.usecases.GetCapabilitiesUseCase
-import com.nextcloud.talk.newarch.features.account.ServerEntryViewModelFactory
+import com.nextcloud.talk.newarch.features.account.serverentry.ServerEntryViewModelFactory
 import org.koin.android.ext.koin.androidApplication
 import org.koin.dsl.module
 
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryCapabilitiesCheckState.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryCapabilitiesCheckState.kt
similarity index 90%
rename from app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryCapabilitiesCheckState.kt
rename to app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryCapabilitiesCheckState.kt
index 9338111a1..b38cfe2be 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryCapabilitiesCheckState.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryCapabilitiesCheckState.kt
@@ -20,7 +20,7 @@
  *
  */
 
-package com.nextcloud.talk.newarch.features.account
+package com.nextcloud.talk.newarch.features.account.serverentry
 
 import kotlinx.serialization.Serializable
 
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryView.kt
similarity index 95%
rename from app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryView.kt
rename to app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryView.kt
index f1dcf1f6a..549d5b565 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryView.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryView.kt
@@ -20,7 +20,7 @@
  *
  */
 
-package com.nextcloud.talk.newarch.features.account
+package com.nextcloud.talk.newarch.features.account.serverentry
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -30,14 +30,10 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import androidx.lifecycle.Observer
-import com.bluelinelabs.conductor.RouterTransaction
-import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
 import com.nextcloud.talk.R
 import com.nextcloud.talk.newarch.conversationsList.mvp.BaseView
 import com.nextcloud.talk.utils.bundle.BundleKeys
 import kotlinx.android.synthetic.main.server_entry_view.view.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.inject
 
 class ServerEntryView : BaseView() {
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryViewModel.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryViewModel.kt
similarity index 97%
rename from app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryViewModel.kt
rename to app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryViewModel.kt
index c23141863..88299445a 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryViewModel.kt
@@ -20,7 +20,7 @@
  *
  */
 
-package com.nextcloud.talk.newarch.features.account
+package com.nextcloud.talk.newarch.features.account.serverentry
 
 import android.app.Application
 import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryViewModelFactory.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryViewModelFactory.kt
similarity index 95%
rename from app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryViewModelFactory.kt
rename to app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryViewModelFactory.kt
index 90958933d..adbb31bfb 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/account/ServerEntryViewModelFactory.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/account/serverentry/ServerEntryViewModelFactory.kt
@@ -20,7 +20,7 @@
  *
  */
 
-package com.nextcloud.talk.newarch.features.account
+package com.nextcloud.talk.newarch.features.account.serverentry
 
 import android.app.Application
 import androidx.lifecycle.ViewModel