diff --git a/V2rayNG/app/src/main/AndroidManifest.xml b/V2rayNG/app/src/main/AndroidManifest.xml
index 3492c7946..6c44ddf9f 100644
--- a/V2rayNG/app/src/main/AndroidManifest.xml
+++ b/V2rayNG/app/src/main/AndroidManifest.xml
@@ -71,51 +71,47 @@
                 android:resource="@xml/shortcuts" />
         </activity>
         <activity
-            android:name=".ui.ServerVmessActivity"
+            android:name=".ui.server.ServerVmessActivity"
             android:exported="false"
             android:windowSoftInputMode="stateUnchanged|adjustResize" />
         <activity
-            android:name=".ui.ServerVlessActivity"
+            android:name=".ui.server.ServerVlessActivity"
             android:exported="false"
             android:windowSoftInputMode="stateUnchanged|adjustResize" />
         <activity
-            android:name=".ui.ServerShadowsocksActivity"
+            android:name=".ui.server.ServerShadowsocksActivity"
             android:exported="false"
             android:windowSoftInputMode="stateUnchanged|adjustResize" />
         <activity
-            android:name=".ui.ServerSocksActivity"
+            android:name=".ui.server.ServerSocksActivity"
             android:exported="false"
             android:windowSoftInputMode="stateUnchanged|adjustResize" />
         <activity
-            android:name=".ui.ServerHttpActivity"
+            android:name=".ui.server.ServerHttpActivity"
             android:exported="false"
             android:windowSoftInputMode="stateUnchanged|adjustResize" />
         <activity
-            android:name=".ui.ServerTrojanActivity"
+            android:name=".ui.server.ServerTrojanActivity"
             android:exported="false"
             android:windowSoftInputMode="stateUnchanged|adjustResize" />
         <activity
-            android:name=".ui.ServerWireguardActivity"
+            android:name=".ui.server.ServerWireguardActivity"
             android:exported="false"
             android:windowSoftInputMode="stateUnchanged|adjustResize" />
         <activity
-            android:name=".ui.ServerHysteria2Activity"
+            android:name=".ui.server.ServerHysteria2Activity"
             android:exported="false"
             android:windowSoftInputMode="stateUnchanged|adjustResize" />
         <activity
-            android:name=".ui.ServerActivity"
+            android:name=".ui.server.ServerCustomConfigActivity"
             android:exported="false"
             android:windowSoftInputMode="stateUnchanged|adjustResize" />
         <activity
-            android:name=".ui.ServerCustomConfigActivity"
+            android:name=".ui.server.ServerGroupActivity"
             android:exported="false"
             android:windowSoftInputMode="stateUnchanged|adjustResize" />
         <activity
-            android:name=".ui.ServerGroupActivity"
-            android:exported="false"
-            android:windowSoftInputMode="stateUnchanged|adjustResize" />
-        <activity
-            android:name=".ui.ServerProxyChainActivity"
+            android:name=".ui.server.ServerProxyChainActivity"
             android:exported="false"
             android:windowSoftInputMode="stateUnchanged|adjustResize" />
         <activity
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
index b354e2822..255ae3bea 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
@@ -129,6 +129,7 @@ import com.v2ray.ang.handler.AngConfigManager
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.SettingsChangeManager
 import com.v2ray.ang.handler.SettingsManager
+import com.v2ray.ang.ui.server.*
 import com.v2ray.ang.util.LogUtil
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.viewmodel.MainViewModel
@@ -309,7 +310,15 @@ class MainActivity : HelperBaseComponentActivity() {
         val intent = when (createConfigType) {
             EConfigType.POLICYGROUP.value -> Intent(this, ServerGroupActivity::class.java)
             EConfigType.PROXYCHAIN.value -> Intent(this, ServerProxyChainActivity::class.java)
-            else -> Intent(this, ServerActivity::class.java).apply {
+            EConfigType.VMESS.value -> Intent(this, ServerVmessActivity::class.java)
+            EConfigType.VLESS.value -> Intent(this, ServerVlessActivity::class.java)
+            EConfigType.SHADOWSOCKS.value -> Intent(this, ServerShadowsocksActivity::class.java)
+            EConfigType.SOCKS.value -> Intent(this, ServerSocksActivity::class.java)
+            EConfigType.HTTP.value -> Intent(this, ServerHttpActivity::class.java)
+            EConfigType.TROJAN.value -> Intent(this, ServerTrojanActivity::class.java)
+            EConfigType.WIREGUARD.value -> Intent(this, ServerWireguardActivity::class.java)
+            EConfigType.HYSTERIA2.value -> Intent(this, ServerHysteria2Activity::class.java)
+            else -> Intent(this, ServerHttpActivity::class.java).apply {
                 putExtra("createConfigType", createConfigType)
             }
         }.apply {
@@ -524,7 +533,7 @@ class MainActivity : HelperBaseComponentActivity() {
             EConfigType.TROJAN -> ServerTrojanActivity::class.java
             EConfigType.WIREGUARD -> ServerWireguardActivity::class.java
             EConfigType.HYSTERIA2 -> ServerHysteria2Activity::class.java
-            else -> ServerCustomConfigActivity::class.java
+            else -> ServerHttpActivity::class.java
         }
         val intent = Intent(this, activityClass).apply {
             putExtra("guid", guid)
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseServerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/BaseServerActivity.kt
similarity index 99%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseServerActivity.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/BaseServerActivity.kt
index 2961efb05..32ded58e7 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseServerActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/BaseServerActivity.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.ui.server
 
 import android.os.Bundle
 import androidx.compose.foundation.layout.Arrangement
@@ -46,6 +46,7 @@ import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.AngConfigManager
 import com.v2ray.ang.handler.CertificateFingerprintManager
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.ui.BaseComponentActivity
 import com.v2ray.ang.util.JsonUtil
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ProfileEditorResult.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ProfileEditorResult.kt
similarity index 97%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/ui/ProfileEditorResult.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ProfileEditorResult.kt
index a63c3f3a3..0cfdc27bc 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ProfileEditorResult.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ProfileEditorResult.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.ui.server
 
 import android.app.Activity
 import android.content.Intent
@@ -43,4 +43,4 @@ object ProfileEditorResult {
         )
         finish()
     }
-}
+}
\ No newline at end of file
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerActivity.kt
similarity index 99%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerActivity.kt
index 9b53ec6b4..7f258becd 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerActivity.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.ui.server
 
 import android.os.Bundle
 import androidx.compose.foundation.layout.Arrangement
@@ -49,6 +49,7 @@ import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.AngConfigManager
 import com.v2ray.ang.handler.CertificateFingerprintManager
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.ui.BaseComponentActivity
 import com.v2ray.ang.util.JsonUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerCustomConfigActivity.kt
similarity index 99%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerCustomConfigActivity.kt
index e288f0b52..7326f62bb 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerCustomConfigActivity.kt
@@ -1,12 +1,10 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.ui.server
 
-import android.app.Activity
 import android.os.Bundle
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
@@ -41,7 +39,6 @@ import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
@@ -70,6 +67,7 @@ import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.fmt.CustomFmt
 import com.v2ray.ang.handler.AngConfigManager
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.ui.BaseComponentActivity
 import com.v2ray.ang.util.LogUtil
 import kotlinx.coroutines.flow.collectLatest
 
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerGroupActivity.kt
similarity index 99%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerGroupActivity.kt
index 88bb89040..fb863b327 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerGroupActivity.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.ui.server
 
 import android.os.Bundle
 import androidx.compose.foundation.layout.Column
@@ -32,6 +32,7 @@ import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.ui.BaseComponentActivity
 
 class ServerGroupActivity : BaseComponentActivity() {
 
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerHttpActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHttpActivity.kt
similarity index 98%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerHttpActivity.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHttpActivity.kt
index 1a7d3b8b7..69934af1a 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerHttpActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHttpActivity.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.ui.server
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerHysteria2Activity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHysteria2Activity.kt
similarity index 98%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerHysteria2Activity.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHysteria2Activity.kt
index 0d4d35e4c..6d23480e0 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerHysteria2Activity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHysteria2Activity.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.ui.server
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerProxyChainActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerProxyChainActivity.kt
similarity index 99%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerProxyChainActivity.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerProxyChainActivity.kt
index b491e00c7..eab574821 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerProxyChainActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerProxyChainActivity.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.ui.server
 
 import android.os.Bundle
 import androidx.compose.animation.core.animateDpAsState
@@ -47,6 +47,7 @@ import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.SettingsManager
+import com.v2ray.ang.ui.BaseComponentActivity
 import sh.calvin.reorderable.ReorderableItem
 import sh.calvin.reorderable.rememberReorderableLazyListState
 
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerShadowsocksActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerShadowsocksActivity.kt
similarity index 98%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerShadowsocksActivity.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerShadowsocksActivity.kt
index 9749d85b2..61555c520 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerShadowsocksActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerShadowsocksActivity.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.ui.server
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerSocksActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerSocksActivity.kt
similarity index 98%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerSocksActivity.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerSocksActivity.kt
index 7772452da..f51df27bb 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerSocksActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerSocksActivity.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.ui.server
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerTrojanActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerTrojanActivity.kt
similarity index 98%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerTrojanActivity.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerTrojanActivity.kt
index 034742b7b..f7249abcb 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerTrojanActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerTrojanActivity.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.ui.server
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerUiState.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerUiState.kt
similarity index 99%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerUiState.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerUiState.kt
index 1ea3f50f3..2604728de 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerUiState.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerUiState.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.ui.server
 
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerVlessActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVlessActivity.kt
similarity index 98%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerVlessActivity.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVlessActivity.kt
index 5f980891f..033a021e8 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerVlessActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVlessActivity.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.ui.server
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerVmessActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVmessActivity.kt
similarity index 98%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerVmessActivity.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVmessActivity.kt
index 4f9ddbfd9..b707e4586 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerVmessActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVmessActivity.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.ui.server
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerWireguardActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerWireguardActivity.kt
similarity index 98%
rename from V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerWireguardActivity.kt
rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerWireguardActivity.kt
index 20de1cadc..f83eff082 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerWireguardActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerWireguardActivity.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.ui.server
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope