wip

WIP
2026-06-07 19:06:09 +03:00 · 2024-09-19 14:28:06 +01:00 · 2024-09-19 06:24:43 -07:00
472 changed files with 20081 additions and 36602 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,39 +0,0 @@
-BasedOnStyle: WebKit
-AccessModifierOffset: '-4'
-AlignAfterOpenBracket: Align
-AlignConsecutiveMacros: 'true'
-AlignTrailingComments: 'true'
-AllowAllArgumentsOnNextLine: 'true'
-AllowAllParametersOfDeclarationOnNextLine: 'true'
-AllowShortBlocksOnASingleLine: 'false'
-AllowShortCaseLabelsOnASingleLine: 'true'
-AllowShortEnumsOnASingleLine: 'false'
-AllowShortFunctionsOnASingleLine: None
-AlwaysBreakTemplateDeclarations: 'No'
-BreakBeforeBinaryOperators: NonAssignment
-BreakBeforeBraces: Custom
-BraceWrapping:
-    AfterClass: true
-    AfterControlStatement: false
-    AfterEnum: false
-    AfterFunction: true
-    AfterNamespace: true
-    AfterObjCDeclaration: false
-    AfterStruct: true
-    AfterUnion: false
-    BeforeCatch: false
-    BeforeElse: false
-    IndentBraces: false
-BreakConstructorInitializers: BeforeColon
-ColumnLimit: '120'
-CommentPragmas: '"^!|^:"'
-ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
-ConstructorInitializerIndentWidth: '4'
-ContinuationIndentWidth: '8'
-IndentPPDirectives: BeforeHash
-NamespaceIndentation: All
-PenaltyExcessCharacter: '10'
-PointerAlignment: Right
-SortIncludes: 'true'
-SpaceAfterTemplateKeyword: 'false'
-Standard: Auto
--- a/.clang-format-ignore
+++ b/.clang-format-ignore
@@ -1,20 +0,0 @@
-/client/3rd
-/client/3rd-prebuild
-/client/android
-/client/cmake
-/client/core/serialization
-/client/daemon
-/client/fonts
-/client/images
-/client/ios
-/client/mozilla
-/client/platforms/dummy
-/client/platforms/linux
-/client/platforms/macos
-/client/platforms/windows
-/client/server_scripts
-/client/translations
-/deploy
-/docs
-/metadata
-/service/src
--- a/.cursorrules
+++ b/.cursorrules
@@ -1,69 +0,0 @@
-# Amnezia VPN Client - MVVM Refactoring Rules
-
-## Architecture Requirements
-
-### MVVM Pattern
- Follow Model-View-ViewModel architecture strictly
- Maintain clear separation of concerns between layers
- UI controllers should only handle user input and delegate to core controllers
- Core controllers contain all business logic and data manipulation
-
-### Dependencies Direction
- UI layer depends on Core layer (unidirectional dependency)
- UI controllers must not depend on each other
- Core controllers must not depend on each other (exceptions: ServerController, VpnConfigurationsController, GatewayController can be created "on the fly")
-
-### Settings Usage
- UI classes must NOT use Settings class directly
- Create wrapper methods in core controllers for Settings operations
-
-### Server Controller Creation
- ServerController creation must happen in Core controllers, never in UI
- Remove direct instantiation: `new ServerController(m_settings)` from UI code
-
-## Code Organization
-
-### Folder Structure
- Core controllers: `client/core/controllers/`
- Core models: `client/core/models/`  
- UI controllers: `client/ui/controllers/`
- UI models: `client/ui/models/`
- Common models and controllers in root of respective folders
-
-### Controller Management
- All controllers must be instantiated in central `coreController`
- Dependencies between core controllers resolved in `coreController`
- UI controllers accept core controllers via constructor injection
- UI controllers should be renamed with "UI" suffix (e.g., `exportUIController`)
-
-## Code Style
-
-### Comments
- Do NOT include comments in code
- Code should be self-documenting
-
-### Models Behavior
- Models should only display data
- Keep core models as pure data structures without business logic
-
-## Refactoring Process
-
-### UI Controller Refactoring
- Remove all business logic from UI controllers
- Replace direct method calls with delegation to core controllers
- Maintain only UI-specific logic (signals, model updates)
- Remove Settings dependencies
-
-### Core Controller Pattern
- Create corresponding methods in core controllers for UI operations
- Core controllers handle all complex logic, network operations, file I/O
- Return structured results with error codes and data
- Manage ServerController lifecycle internally
-
-## Git Workflow
- Use `git mv` for renaming controllers to maintain history
-
-## Error Handling
- Core controllers return structured error results
- UI controllers only handle error presentation
- Maintain consistent error propagation patterns 
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -10,18 +10,13 @@ env:

 jobs:
  Build-Linux-Ubuntu:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04

    env:
      QT_VERSION: 6.6.2
      QIF_VERSION: 4.7
      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
-      PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
      DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
-      DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
-      DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}
-      FREE_V2_ENDPOINT: ${{ secrets.FREE_V2_ENDPOINT }}
-      PREM_V1_ENDPOINT: ${{ secrets.PREM_V1_ENDPOINT }}

    steps:
    - name: 'Install Qt'
@@ -88,12 +83,7 @@ jobs:
      QIF_VERSION: 4.7
      BUILD_ARCH: 64
      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
-      PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
      DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
-      DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
-      DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}
-      FREE_V2_ENDPOINT: ${{ secrets.FREE_V2_ENDPOINT }}
-      PREM_V1_ENDPOINT: ${{ secrets.PREM_V1_ENDPOINT }}

    steps:
    - name: 'Get sources'
@@ -156,12 +146,7 @@ jobs:
      CC: cc
      CXX: c++
      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
-      PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
      DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
-      DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
-      DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}
-      FREE_V2_ENDPOINT: ${{ secrets.FREE_V2_ENDPOINT }}
-      PREM_V1_ENDPOINT: ${{ secrets.PREM_V1_ENDPOINT }}

    steps:
    - name: 'Setup xcode'
@@ -196,7 +181,7 @@ jobs:
    - name: 'Install go'
      uses: actions/setup-go@v5
      with:
-        go-version: '1.24'
+        go-version: '1.20'
        cache: false

    - name: 'Setup gomobile'
@@ -223,11 +208,7 @@ jobs:
        export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/ios/bin"
        export QT_MACOS_ROOT_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos"
        export PATH=$PATH:~/go/bin
-        sh deploy/build_ios.sh | \
-          sed -e '/-Xcc -DPROD_AGW_PUBLIC_KEY/,/-Xcc/ { /-Xcc/!d; }' -e '/-Xcc -DPROD_AGW_PUBLIC_KEY/d' | \
-          sed -e '/-Xcc -DDEV_AGW_PUBLIC_KEY/,/-Xcc/ { /-Xcc/!d; }' -e '/-Xcc -DDEV_AGW_PUBLIC_KEY/d' | \
-          sed -e '/-DPROD_AGW_PUBLIC_KEY/,/-D/ { /-D/!d; }' -e '/-DPROD_AGW_PUBLIC_KEY/d' | \
-          sed -e '/-DDEV_AGW_PUBLIC_KEY/,/-D/ { /-D/!d; }' -e '/-DDEV_AGW_PUBLIC_KEY/d'
+        sh deploy/build_ios.sh
      env:
        IOS_TRUST_CERT_BASE64: ${{ secrets.IOS_TRUST_CERT_BASE64 }}
        IOS_SIGNING_CERT_BASE64: ${{ secrets.IOS_SIGNING_CERT_BASE64 }}
@@ -249,39 +230,21 @@ jobs:

 # ------------------------------------------------------

-  Build-MacOS-old:
+  Build-MacOS:
    runs-on: macos-latest

    env:
      # Keep compat with MacOS 10.15 aka Catalina by Qt 6.4
      QT_VERSION: 6.4.3
-
-      MAC_TEAM_ID: ${{ secrets.MAC_TEAM_ID }}
-
-      MAC_APP_CERT_CERT: ${{ secrets.MAC_APP_CERT_CERT }}
-      MAC_SIGNER_ID: ${{ secrets.MAC_SIGNER_ID }}
-      MAC_APP_CERT_PW: ${{ secrets.MAC_APP_CERT_PW }}
-
-      MAC_INSTALLER_SIGNER_CERT: ${{ secrets.MAC_INSTALLER_SIGNER_CERT }}
-      MAC_INSTALLER_SIGNER_ID: ${{ secrets.MAC_INSTALLER_SIGNER_ID }}
-      MAC_INSTALL_CERT_PW: ${{ secrets.MAC_INSTALL_CERT_PW }}
-
-      APPLE_DEV_EMAIL: ${{ secrets.APPLE_DEV_EMAIL }}
-      APPLE_DEV_PASSWORD: ${{ secrets.APPLE_DEV_PASSWORD }}
-
+      QIF_VERSION: 4.6
      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
-      PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
      DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
-      DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
-      DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}
-      FREE_V2_ENDPOINT: ${{ secrets.FREE_V2_ENDPOINT }}
-      PREM_V1_ENDPOINT: ${{ secrets.PREM_V1_ENDPOINT }}

    steps:
    - name: 'Setup xcode'
      uses: maxim-lobanov/setup-xcode@v1
      with:
-        xcode-version: '15.4.0'
+        xcode-version: '14.3.1'

    - name: 'Install Qt'
      uses: jurplel/install-qt-action@v3
@@ -296,6 +259,11 @@ jobs:
        set-env: 'true'
        extra: '--external 7z --base ${{ env.QT_MIRROR }}'

+    - name: 'Install Qt Installer Framework ${{ env.QIF_VERSION }}'
+      run: |
+        mkdir -pv ${{ runner.temp }}/Qt/Tools/QtInstallerFramework
+        wget https://qt.amzsvc.com/tools/ifw/${{ env.QIF_VERSION }}.zip
+        unzip ${{ env.QIF_VERSION }}.zip -d ${{ runner.temp }}/Qt/Tools/QtInstallerFramework/

    - name: 'Get sources'
      uses: actions/checkout@v4
@@ -309,90 +277,14 @@ jobs:
    - name: 'Build project'
      run: |
        export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos/bin"
-        bash deploy/build_macos.sh -n
-
-    - name: 'Upload installer artifact'
-      uses: actions/upload-artifact@v4
-      with:
-        name: AmneziaVPN_MacOS_old_installer
-        path: deploy/build/pkg/AmneziaVPN.pkg
-        retention-days: 7
-
-    - name: 'Upload unpacked artifact'
-      uses: actions/upload-artifact@v4
-      with:
-        name: AmneziaVPN_MacOS_old_unpacked
-        path: deploy/build/client/AmneziaVPN.app
-        retention-days: 7
-
-# ------------------------------------------------------
-
-  Build-MacOS:
-    runs-on: macos-latest
-
-    env:
-      QT_VERSION: 6.8.0
-
-      MAC_TEAM_ID: ${{ secrets.MAC_TEAM_ID }}
-
-      MAC_APP_CERT_CERT: ${{ secrets.MAC_APP_CERT_CERT }}
-      MAC_SIGNER_ID: ${{ secrets.MAC_SIGNER_ID }}
-      MAC_APP_CERT_PW: ${{ secrets.MAC_APP_CERT_PW }}
-
-      MAC_INSTALLER_SIGNER_CERT: ${{ secrets.MAC_INSTALLER_SIGNER_CERT }}
-      MAC_INSTALLER_SIGNER_ID: ${{ secrets.MAC_INSTALLER_SIGNER_ID }}
-      MAC_INSTALL_CERT_PW: ${{ secrets.MAC_INSTALL_CERT_PW }}
-
-      APPLE_DEV_EMAIL: ${{ secrets.APPLE_DEV_EMAIL }}
-      APPLE_DEV_PASSWORD: ${{ secrets.APPLE_DEV_PASSWORD }}
-
-      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
-      PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
-      DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
-      DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
-      DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}
-      FREE_V2_ENDPOINT: ${{ secrets.FREE_V2_ENDPOINT }}
-      PREM_V1_ENDPOINT: ${{ secrets.PREM_V1_ENDPOINT }}
-
-    steps:
-    - name: 'Setup xcode'
-      uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: '15.4.0'
-
-    - name: 'Install Qt'
-      uses: jurplel/install-qt-action@v3
-      with:
-        version: ${{ env.QT_VERSION }}
-        host: 'mac'
-        target: 'desktop'
-        arch: 'clang_64'
-        modules: 'qtremoteobjects qt5compat qtshadertools'
-        dir: ${{ runner.temp }}
-        setup-python: 'true'
-        set-env: 'true'
-        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
-
-
-    - name: 'Get sources'
-      uses: actions/checkout@v4
-      with:
-        submodules: 'true'
-        fetch-depth: 10
-
-    - name: 'Setup ccache'
-      uses: hendrikmuhs/ccache-action@v1.2
-
-    - name: 'Build project'
-      run: |
-        export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos/bin"
-        bash deploy/build_macos.sh -n
+        export QIF_BIN_DIR="${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin"
+        bash deploy/build_macos.sh

    - name: 'Upload installer artifact'
      uses: actions/upload-artifact@v4
      with:
        name: AmneziaVPN_MacOS_installer
-        path: deploy/build/pkg/AmneziaVPN.pkg
+        path: AmneziaVPN.dmg
        retention-days: 7

    - name: 'Upload unpacked artifact'
@@ -409,15 +301,10 @@ jobs:

    env:
      ANDROID_BUILD_PLATFORM: android-34
-      QT_VERSION: 6.7.3
+      QT_VERSION: 6.7.2
      QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
-      PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
      DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
-      DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
-      DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}
-      FREE_V2_ENDPOINT: ${{ secrets.FREE_V2_ENDPOINT }}
-      PREM_V1_ENDPOINT: ${{ secrets.PREM_V1_ENDPOINT }}

    steps:
    - name: 'Install desktop Qt'
@@ -429,8 +316,7 @@ jobs:
        arch: 'linux_gcc_64'
        modules: ${{ env.QT_MODULES }}
        dir: ${{ runner.temp }}
-        py7zrversion: '==0.22.*'
-        extra: '--base ${{ env.QT_MIRROR }}'
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'

    - name: 'Install android_x86_64 Qt'
      uses: jurplel/install-qt-action@v4
@@ -441,8 +327,7 @@ jobs:
        arch: 'android_x86_64'
        modules: ${{ env.QT_MODULES }}
        dir: ${{ runner.temp }}
-        py7zrversion: '==0.22.*'
-        extra: '--base ${{ env.QT_MIRROR }}'
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'

    - name: 'Install android_x86 Qt'
      uses: jurplel/install-qt-action@v4
@@ -453,8 +338,7 @@ jobs:
        arch: 'android_x86'
        modules: ${{ env.QT_MODULES }}
        dir: ${{ runner.temp }}
-        py7zrversion: '==0.22.*'
-        extra: '--base ${{ env.QT_MIRROR }}'
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'

    - name: 'Install android_armv7 Qt'
      uses: jurplel/install-qt-action@v4
@@ -465,8 +349,7 @@ jobs:
        arch: 'android_armv7'
        modules: ${{ env.QT_MODULES }}
        dir: ${{ runner.temp }}
-        py7zrversion: '==0.22.*'
-        extra: '--base ${{ env.QT_MIRROR }}'
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'

    - name: 'Install android_arm64_v8a Qt'
      uses: jurplel/install-qt-action@v4
@@ -477,8 +360,7 @@ jobs:
        arch: 'android_arm64_v8a'
        modules: ${{ env.QT_MODULES }}
        dir: ${{ runner.temp }}
-        py7zrversion: '==0.22.*'
-        extra: '--base ${{ env.QT_MIRROR }}'
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'

    - name: 'Grant execute permission for qt-cmake'
      shell: bash
--- a/.github/workflows/tag-deploy.yml
+++ b/.github/workflows/tag-deploy.yml
@@ -16,12 +16,7 @@ jobs:
      QT_VERSION: 6.4.1
      QIF_VERSION: 4.5
      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
-      PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}
      DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
-      DEV_AGW_ENDPOINT: ${{ secrets.DEV_AGW_ENDPOINT }}
-      DEV_S3_ENDPOINT: ${{ secrets.DEV_S3_ENDPOINT }}
-      FREE_V2_ENDPOINT: ${{ secrets.FREE_V2_ENDPOINT }}
-      PREM_V1_ENDPOINT: ${{ secrets.PREM_V1_ENDPOINT }}

    steps:
    - name: 'Install desktop Qt'
--- a/.github/workflows/tag-upload.yml
+++ b/.github/workflows/tag-upload.yml
@@ -1,41 +1,64 @@
 name: 'Upload a new version'

 on:
-  workflow_dispatch:
-    inputs:
-      RELEASE_VERSION:
-        description: 'Release version (e.g. 1.2.3.4)'
-        required: true
-        type: string
+  push:
+    tags:
+    - '[0-9]+.[0-9]+.[0-9]+.[0-9]+'

 jobs:
-  Upload-S3:
+  upload:
    runs-on: ubuntu-latest
+    name: upload
    steps:
-      - name: Checkout
+      - name: Checkout CMakeLists.txt
        uses: actions/checkout@v4
        with:
-          ref: ${{ inputs.RELEASE_VERSION }}
+          ref: ${{ github.ref_name }}
          sparse-checkout: |
            CMakeLists.txt
-            deploy/deploy_s3.sh
          sparse-checkout-cone-mode: false

      - name: Verify git tag
        run: |
-          TAG_NAME=${{ inputs.RELEASE_VERSION }}
+          GIT_TAG=${{ github.ref_name }}
          CMAKE_TAG=$(grep 'project.*VERSION' CMakeLists.txt | sed -E 's/.* ([0-9]+.[0-9]+.[0-9]+.[0-9]+)$/\1/')
-          if [[ "$TAG_NAME" == "$CMAKE_TAG" ]]; then
-            echo "Git tag ($TAG_NAME) matches CMakeLists.txt version ($CMAKE_TAG)."
+
+          if [[ "$GIT_TAG" == "$CMAKE_TAG" ]]; then
+            echo "Git tag ($GIT_TAG) and version in CMakeLists.txt ($CMAKE_TAG) are the same. Continuing..."
          else
-            echo "::error::Mismatch: Git tag ($TAG_NAME) != CMakeLists.txt version ($CMAKE_TAG). Exiting with error..."
+            echo "Git tag ($GIT_TAG) and version in CMakeLists.txt ($CMAKE_TAG) are not the same! Cancelling..."
            exit 1
          fi

-      - name: Setup Rclone
-        uses: AnimMouse/setup-rclone@v1
+      - name: Download artifacts from the "${{ github.ref_name }}" tag
+        uses: robinraju/release-downloader@v1.8
        with:
-          rclone_config: ${{ secrets.RCLONE_CONFIG }}
+          tag: ${{ github.ref_name }}
+          fileName: "AmneziaVPN_(Linux_|)${{ github.ref_name }}*"
+          out-file-path: ${{ github.ref_name }}

-      - name: Send dist to S3
-        run: bash deploy/deploy_s3.sh ${{ inputs.RELEASE_VERSION }}
+      - name: Upload beta version
+        uses: jakejarvis/s3-sync-action@master
+        if: contains(github.event.base_ref, 'dev')
+        with:
+          args: --include "AmneziaVPN*" --delete
+        env:
+          AWS_S3_BUCKET: updates
+          AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_SECRET_ACCESS_KEY }}
+          AWS_S3_ENDPOINT: https://${{ vars.CF_ACCOUNT_ID }}.r2.cloudflarestorage.com
+          SOURCE_DIR: ${{ github.ref_name }}
+          DEST_DIR: beta/${{ github.ref_name }}
+
+      - name: Upload stable version
+        uses: jakejarvis/s3-sync-action@master
+        if: contains(github.event.base_ref, 'master')
+        with:
+          args: --include "AmneziaVPN*" --delete
+        env:
+          AWS_S3_BUCKET: updates
+          AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_SECRET_ACCESS_KEY }}
+          AWS_S3_ENDPOINT: https://${{ vars.CF_ACCOUNT_ID }}.r2.cloudflarestorage.com
+          SOURCE_DIR: ${{ github.ref_name }}
+          DEST_DIR: stable/${{ github.ref_name }}
--- a/.gitignore
+++ b/.gitignore
@@ -133,9 +133,4 @@ client/3rd/ShadowSocks/ss_ios.xcconfig
 out/

 # CMake files
-CMakeFiles/
-
-ios-ne-build.sh
-macos-ne-build.sh
-macos-signed-build.sh
-macos-with-sign-build.sh
+CMakeFiles/
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
+[submodule "client/3rd/OpenVPNAdapter"]
+	path = client/3rd/OpenVPNAdapter
+	url = https://github.com/amnezia-vpn/OpenVPNAdapter.git
 [submodule "client/3rd/qtkeychain"]
 	path = client/3rd/qtkeychain
 	url = https://github.com/frankosterfeld/qtkeychain.git
@@ -7,7 +10,6 @@
 [submodule "client/3rd-prebuilt"]
 	path = client/3rd-prebuilt
 	url = https://github.com/amnezia-vpn/3rd-prebuilt
-	branch = feature/special-handshake
 [submodule "client/3rd/amneziawg-apple"]
 	path = client/3rd/amneziawg-apple
 	url = https://github.com/amnezia-vpn/amneziawg-apple
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,8 @@
 cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)

 set(PROJECT AmneziaVPN)
-set(AMNEZIAVPN_VERSION 4.8.9.1)

-project(${PROJECT} VERSION ${AMNEZIAVPN_VERSION}
+project(${PROJECT} VERSION 4.8.0.5
        DESCRIPTION "AmneziaVPN"
        HOMEPAGE_URL "https://amnezia.org/"
 )
@@ -12,7 +11,7 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
 set(RELEASE_DATE "${CURRENT_DATE}")

 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
-set(APP_ANDROID_VERSION_CODE 2091)
+set(APP_ANDROID_VERSION_CODE 61)

 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
    set(MZ_PLATFORM_NAME "linux")
@@ -29,7 +28,7 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
 endif()

 set(QT_BUILD_TOOLS_WHEN_CROSS_COMPILING ON)
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

 if(APPLE AND NOT IOS)
--- a/README.md
+++ b/README.md
@@ -1,31 +1,30 @@
 # Amnezia VPN
-
-### _The best client for self-hosted VPN_
-
+## _The best client for self-hosted VPN_

 [![Build Status](https://github.com/amnezia-vpn/amnezia-client/actions/workflows/deploy.yml/badge.svg?branch=dev)](https://github.com/amnezia-vpn/amnezia-client/actions/workflows/deploy.yml?query=branch:dev)
 [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/amnezia-vpn/amnezia-client)

-### [English]([https://github.com/amnezia-vpn/amnezia-client/blob/dev/README_RU.md](https://github.com/amnezia-vpn/amnezia-client/tree/dev?tab=readme-ov-file#)) | [Русский](https://github.com/amnezia-vpn/amnezia-client/blob/dev/README_RU.md)
+Amnezia is an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server.

+![Image](https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/uipic4.png)

-[Amnezia](https://amnezia.org) is an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server.
+<br>

-[![Image](https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/uipic4.png)](https://amnezia.org)
+<a href="https://github.com/amnezia-vpn/amnezia-client/releases/download/4.7.0.0/AmneziaVPN_4.7.0.0_x64.exe"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/win.png" width="150" style="max-width: 100%;"></a> 
+<a href="https://github.com/amnezia-vpn/amnezia-client/releases/download/4.7.0.0/AmneziaVPN_4.7.0.0.dmg"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/mac.png" width="150" style="max-width: 100%;"></a> 
+<a href="https://github.com/amnezia-vpn/amnezia-client/releases/download/4.7.0.0/AmneziaVPN_Linux_4.7.0.0.tar.zip"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/lin.png" width="150" style="max-width: 100%;"></a>
+<a href="https://github.com/amnezia-vpn/amnezia-client/releases/tag/4.7.0.0"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/andr.png" width="150" style="max-width: 100%;"></a>

-### [Website](https://amnezia.org) | [Alt website link](https://storage.googleapis.com/amnezia/amnezia.org) | [Documentation](https://docs.amnezia.org) | [Troubleshooting](https://docs.amnezia.org/troubleshooting)
+<br>

-> [!TIP]
-> If the [Amnezia website](https://amnezia.org) is blocked in your region, you can use an [Alternative website link](https://storage.googleapis.com/amnezia/amnezia.org ).
+<a href="https://play.google.com/store/search?q=amnezia+vpn&c=apps"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/play.png" width="150" style="max-width: 100%;"></a>
+<a href="https://apps.apple.com/us/app/amneziavpn/id1600529900"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/apl.png" width="150" style="max-width: 100%;"></a>

-<a href="https://amnezia.org/downloads"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/download-website.svg" width="150" style="max-width: 100%; margin-right: 10px"></a>
-<a href="https://storage.googleapis.com/amnezia/q9p19109"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/download-alt.svg" width="150" style="max-width: 100%;"></a>

 [All releases](https://github.com/amnezia-vpn/amnezia-client/releases)

-<br/>
+<br>

-<a href="https://www.testiny.io"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/testiny.png" height="28px"></a>

 ## Features

@@ -38,8 +37,7 @@

 ## Links

- [https://amnezia.org](https://amnezia.org) - Project website | [Alternative link (mirror)](https://storage.googleapis.com/kldscp/amnezia.org)
- [https://docs.amnezia.org](https://docs.amnezia.org) - Documentation
+- [https://amnezia.org](https://amnezia.org) - project website  
 - [https://www.reddit.com/r/AmneziaVPN](https://www.reddit.com/r/AmneziaVPN) - Reddit  
 - [https://t.me/amnezia_vpn_en](https://t.me/amnezia_vpn_en) - Telegram support channel (English) 
 - [https://t.me/amnezia_vpn_ir](https://t.me/amnezia_vpn_ir) - Telegram support channel (Farsi) 
@@ -185,11 +183,11 @@ GPL v3.0

 Patreon: [https://www.patreon.com/amneziavpn](https://www.patreon.com/amneziavpn)

-Bitcoin: bc1qmhtgcf9637rl3kqyy22r2a8wa8laka4t9rx2mf <br>
+Bitcoin: bc1q26eevjcg9j0wuyywd2e3uc9cs2w58lpkpjxq6p <br>
 USDT BEP20: 0x6abD576765a826f87D1D95183438f9408C901bE4 <br>
 USDT TRC20: TELAitazF1MZGmiNjTcnxDjEiH5oe7LC9d <br>
-XMR: 48spms39jt1L2L5vyw2RQW6CXD6odUd4jFu19GZcDyKKQV9U88wsJVjSbL4CfRys37jVMdoaWVPSvezCQPhHXUW5UKLqUp3 <br> 
-TON: UQDpU1CyKRmg7L8mNScKk9FRc2SlESuI7N-Hby4nX-CcVmns
+XMR: 48spms39jt1L2L5vyw2RQW6CXD6odUd4jFu19GZcDyKKQV9U88wsJVjSbL4CfRys37jVMdoaWVPSvezCQPhHXUW5UKLqUp3  
+
 ## Acknowledgments

 This project is tested with BrowserStack.
--- a/README_RU.md
+++ b/README_RU.md
@@ -1,181 +0,0 @@
-# Amnezia VPN
-
-### _Лучший клиент для создания VPN на собственном сервере_
-
-[![Build Status](https://github.com/amnezia-vpn/amnezia-client/actions/workflows/deploy.yml/badge.svg?branch=dev)](https://github.com/amnezia-vpn/amnezia-client/actions/workflows/deploy.yml?query=branch:dev)
-[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/amnezia-vpn/amnezia-client)
-
-### [English](https://github.com/amnezia-vpn/amnezia-client/blob/dev/README.md) | Русский
-[AmneziaVPN](https://amnezia.org) — это open source VPN-клиент, ключевая особенность которого заключается в возможности развернуть собственный VPN на вашем сервере.
-
-[![Image](https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/uipic4.png)](https://amnezia.org)
-
-### [Сайт](https://amnezia.org) | [Зеркало сайта](https://storage.googleapis.com/amnezia/amnezia.org) | [Документация](https://docs.amnezia.org) | [Решение проблем](https://docs.amnezia.org/troubleshooting)
-
-> [!TIP]
-> Если [сайт Amnezia](https://amnezia.org) заблокирован в вашем регионе, вы можете воспользоваться [ссылкой на зеркало](https://storage.googleapis.com/amnezia/amnezia.org).
-
-<a href="https://storage.googleapis.com/amnezia/q9p19109"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/download-website-ru.svg" width="150" style="max-width: 100%; margin-right: 10px"></a>
-
-
-[Все релизы](https://github.com/amnezia-vpn/amnezia-client/releases)
-
-<br/>
-
-<a href="https://www.testiny.io"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/testiny.png" height="28px"></a>
-
-## Особенности
-
- Простой в использовании — введите IP-адрес, SSH-логин и пароль, и Amnezia автоматически установит VPN-контейнеры Docker на ваш сервер и подключится к VPN.
- Классические VPN-протоколы: OpenVPN, WireGuard и IKEv2.
- Протоколы с маскировкой трафика (обфускацией): OpenVPN с плагином [Cloak](https://github.com/cbeuw/Cloak), Shadowsocks (OpenVPN over Shadowsocks), [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) and XRay.
- Поддержка Split Tunneling — добавляйте любые сайты или приложения в список, чтобы включить VPN только для них.
- Поддерживает платформы: Windows, macOS, Linux, Android, iOS.
- Поддержка конфигурации протокола AmneziaWG на [бета-прошивке Keenetic](https://docs.keenetic.com/ua/air/kn-1611/en/6319-latest-development-release.html#UUID-186c4108-5afd-c10b-f38a-cdff6c17fab3_section-idm33192196168192-improved).
-
-## Ссылки
-
- [https://amnezia.org](https://amnezia.org) - Веб-сайт проекта | [Альтернативная ссылка (зеркало)](https://storage.googleapis.com/kldscp/amnezia.org)
- [https://docs.amnezia.org](https://docs.amnezia.org) - Документация
- [https://www.reddit.com/r/AmneziaVPN](https://www.reddit.com/r/AmneziaVPN) - Reddit  
- [https://t.me/amnezia_vpn_en](https://t.me/amnezia_vpn_en) - Канал поддержки в Telegram (Английский)
- [https://t.me/amnezia_vpn_ir](https://t.me/amnezia_vpn_ir) - Канал поддержки в Telegram (Фарси)
- [https://t.me/amnezia_vpn_mm](https://t.me/amnezia_vpn_mm) - Канал поддержки в Telegram (Мьянма) 
- [https://t.me/amnezia_vpn](https://t.me/amnezia_vpn) - Канал поддержки в Telegram  (Русский)
- [https://vpnpay.io/en/amnezia-premium/](https://vpnpay.io/en/amnezia-premium/) - Amnezia Premium | [Зеркало](https://storage.googleapis.com/kldscp/vpnpay.io/ru/amnezia-premium\)
-
-## Технологии
-
-AmneziaVPN использует несколько проектов с открытым исходным кодом:
-
- [OpenSSL](https://www.openssl.org/)
- [OpenVPN](https://openvpn.net/)
- [Shadowsocks](https://shadowsocks.org/)
- [Qt](https://www.qt.io/)
- [LibSsh](https://libssh.org)
- и другие...
-
-## Проверка исходного кода
-После клонирования репозитория обязательно загрузите все подмодули.
-
-```bash
-git submodule update --init --recursive
-```
-
-
-## Разработка
-Хотите внести свой вклад? Добро пожаловать!
-
-### Помощь с переводами
-
-Загрузите самые актуальные файлы перевода.
-
-Перейдите на [вкладку "Actions"](https://github.com/amnezia-vpn/amnezia-client/actions?query=is%3Asuccess+branch%3Adev), нажмите на первую строку. Затем прокрутите вниз до раздела "Artifacts" и скачайте "AmneziaVPN_translations".
-
-Распакуйте этот файл. Каждый файл с расширением *.ts содержит строки для соответствующего языка.
-
-Переведите или исправьте строки в одном или нескольких файлах *.ts и загрузите их обратно в этот репозиторий в папку ``client/translations``. Это можно сделать через веб-интерфейс или любым другим знакомым вам способом.
-
-### Сборка исходного кода и деплой
-Проверьте папку deploy для скриптов сборки.
-
-### Как собрать iOS-приложение из исходного кода на MacOS
-1. Убедитесь, что у вас установлен Xcode версии 14 или выше.
-2. Для генерации проекта Xcode используется QT. Требуется версия QT 6.6.2. Установите QT для MacOS здесь или через QT Online Installer. Необходимые модули:
- MacOS
- iOS
- Модуль совместимости с Qt 5
- Qt Shader Tools
- Дополнительные библиотеки:
- - Qt Image Formats
- - Qt Multimedia
- - Qt Remote Objects
-
-   
-3. Установите CMake, если это необходимо. Рекомендуемая версия — 3.25. Скачать CMake можно здесь.
-4. Установите Go версии >= v1.16. Если Go ещё не установлен, скачайте его с  [официального сайта](https://golang.org/dl/) или используйте Homebrew. Установите gomobile:
-
-```bash
-export PATH=$PATH:~/go/bin
-go install golang.org/x/mobile/cmd/gomobile@latest
-gomobile init
-```
-
-5. Соберите проект:
-```bash
-export QT_BIN_DIR="<PATH-TO-QT-FOLDER>/Qt/<QT-VERSION>/ios/bin"
-export QT_MACOS_ROOT_DIR="<PATH-TO-QT-FOLDER>/Qt/<QT-VERSION>/macos"
-export QT_IOS_BIN=$QT_BIN_DIR
-export PATH=$PATH:~/go/bin
-mkdir build-ios
-$QT_IOS_BIN/qt-cmake . -B build-ios -GXcode -DQT_HOST_PATH=$QT_MACOS_ROOT_DIR
-```
-Замените <PATH-TO-QT-FOLDER> и <QT-VERSION> на ваши значения.
-
-Если появляется ошибка gomobile: command not found, убедитесь, что PATH настроен на папку bin, где установлен gomobile:
-```bash
-export PATH=$(PATH):/path/to/GOPATH/bin
-```
-
-6. Откройте проект в Xcode. Теперь вы можете тестировать, архивировать или публиковать приложение.
-   
-Если сборка завершится с ошибкой:
-```
-make: *** 
-[$(PROJECTDIR)/client/build/AmneziaVPN.build/Debug-iphoneos/wireguard-go-bridge/goroot/.prepared] 
-Error 1
-```
-Добавьте пользовательскую переменную PATH в настройки сборки для целей AmneziaVPN и WireGuardNetworkExtension с ключом `PATH` и значением `${PATH}/path/to/bin/folder/with/go/executable`, e.g. `${PATH}:/usr/local/go/bin`.
-
-Если ошибка повторяется на Mac с M1, установите версию CMake для архитектуры ARM:
-```
-arch -arm64 brew install cmake
-```
-
- При первой попытке сборка может завершиться с ошибкой source files not found. Это происходит из-за параллельной компиляции зависимостей в XCode. Просто перезапустите сборку.
-
-
-## Как собрать Android-приложение
-Сборка тестировалась на MacOS. Требования:
- JDK 11
- Android SDK 33
- CMake 3.25.0
-  
-Установите QT, QT Creator и Android Studio.
-Настройте QT Creator:
-
- В меню QT Creator перейдите в  `QT Creator` -> `Preferences` -> `Devices` ->`Android`.
- Укажите путь к JDK 11.
- Укажите путь к Android SDK (`$ANDROID_HOME`)
-
-Если вы сталкиваетесь с ошибками, связанными с отсутствием SDK или сообщением «SDK manager not running», их нельзя исправить просто корректировкой путей. Если у вас есть несколько свободных гигабайт на диске, вы можете позволить Qt Creator установить все необходимые компоненты, выбрав пустую папку для расположения Android SDK и нажав кнопку **Set Up SDK**. Учтите: это установит второй Android SDK и NDK на вашем компьютере!
-
-Убедитесь, что настроена правильная версия CMake: перейдите в **Qt Creator -> Preferences** и в боковом меню выберите пункт **Kits**. В центральной части окна, на вкладке **Kits**, найдите запись для инструмента **CMake Tool**. Если выбранная по умолчанию версия CMake ниже 3.25.0, установите на свою систему CMake версии 3.25.0 или выше, а затем выберите опцию **System CMake at <путь>** из выпадающего списка. Если этот пункт отсутствует, это может означать, что вы еще не установили CMake, или Qt Creator не смог найти путь к нему. В таком случае в окне **Preferences** перейдите в боковое меню **CMake**, затем во вкладку **Tools** в центральной части окна и нажмите кнопку **Add**, чтобы указать путь к установленному CMake.
-
-Убедитесь, что для вашего проекта выбрана Android Platform SDK 33: в главном окне на боковой панели выберите пункт **Projects**, и слева вы увидите раздел **Build & Run**, показывающий различные целевые Android-платформы. Вы можете выбрать любую из них, так как настройка проекта Amnezia VPN разработана таким образом, чтобы все Android-цели могли быть собраны. Перейдите в подраздел **Build** и прокрутите центральную часть окна до раздела **Build Steps**. Нажмите **Details** в заголовке **Build Android APK** (кнопка **Details** может быть скрыта, если окно Qt Creator не запущено в полноэкранном режиме!). Вот здесь выберите **android-33** в качестве Android Build Platform SDK.
-
-### Разработка Android-компонентов
-
-После сборки QT Creator копирует проект в отдельную папку, например, `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>`. Для разработки Android-компонентов откройте сгенерированный проект в Android Studio, указав папку `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>/client/android-build` в качестве корневой.
-Изменения в сгенерированном проекте нужно вручную перенести в репозиторий. После этого можно коммитить изменения.
-Если возникают проблемы со сборкой в QT Creator после работы в Android Studio, выполните команду `./gradlew clean` в корневой папке сгенерированного проекта (`<path>/client/android-build/.`).
-
-
-## Лицензия
-
-GPL v3.0
-
-## Донаты
-
-Patreon: [https://www.patreon.com/amneziavpn](https://www.patreon.com/amneziavpn)
-
-Bitcoin: bc1qmhtgcf9637rl3kqyy22r2a8wa8laka4t9rx2mf <br>
-USDT BEP20: 0x6abD576765a826f87D1D95183438f9408C901bE4 <br>
-USDT TRC20: TELAitazF1MZGmiNjTcnxDjEiH5oe7LC9d <br>
-XMR: 48spms39jt1L2L5vyw2RQW6CXD6odUd4jFu19GZcDyKKQV9U88wsJVjSbL4CfRys37jVMdoaWVPSvezCQPhHXUW5UKLqUp3 <br> 
-TON: UQDpU1CyKRmg7L8mNScKk9FRc2SlESuI7N-Hby4nX-CcVmns
-
-## Благодарности
-
-Этот проект тестируется с помощью BrowserStack.
-Мы выражаем благодарность [BrowserStack](https://www.browserstack.com) за поддержку нашего проекта.
--- a/client/3rd-prebuilt
+++ b/client/3rd-prebuilt
--- a/client/3rd/OpenVPNAdapter
+++ b/client/3rd/OpenVPNAdapter
--- a/client/3rd/SingleApplication/singleapplication.cmake
+++ b/client/3rd/SingleApplication/singleapplication.cmake
@@ -0,0 +1,25 @@
+include_directories(${CMAKE_CURRENT_LIST_DIR})
+
+find_package(Qt6 REQUIRED COMPONENTS 
+    Core Network
+)
+set(LIBS ${LIBS} Qt6::Core Qt6::Network)
+
+
+set(HEADERS ${HEADERS}
+    ${CMAKE_CURRENT_LIST_DIR}/singleapplication.h 
+    ${CMAKE_CURRENT_LIST_DIR}/singleapplication_p.h
+)
+
+set(SOURCES ${SOURCES}
+    ${CMAKE_CURRENT_LIST_DIR}/singleapplication.cpp 
+    ${CMAKE_CURRENT_LIST_DIR}/singleapplication_p.cpp
+)
+
+if(WIN32)
+    if(MSVC)
+        set(LIBS ${LIBS} Advapi32.lib)
+    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+        set(LIBS ${LIBS} advapi32)
+    endif()    
+endif()
--- a/client/3rd/SingleApplication/singleapplication.cpp
+++ b/client/3rd/SingleApplication/singleapplication.cpp
@@ -0,0 +1,274 @@
+// The MIT License (MIT)
+//
+// Copyright (c) Itay Grudev 2015 - 2020
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QByteArray>
+#include <QtCore/QSharedMemory>
+
+#include "singleapplication.h"
+#include "singleapplication_p.h"
+
+/**
+ * @brief Constructor. Checks and fires up LocalServer or closes the program
+ * if another instance already exists
+ * @param argc
+ * @param argv
+ * @param allowSecondary Whether to enable secondary instance support
+ * @param options Optional flags to toggle specific behaviour
+ * @param timeout Maximum time blocking functions are allowed during app load
+ */
+SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout, const QString &userData )
+    : app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) )
+{
+    Q_D( SingleApplication );
+
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
+    // On Android and iOS since the library is not supported fallback to
+    // standard QApplication behaviour by simply returning at this point.
+    qWarning() << "SingleApplication is not supported on Android and iOS systems.";
+    return;
+#endif
+
+    // Store the current mode of the program
+    d->options = options;
+
+    // Add any unique user data
+    if ( ! userData.isEmpty() )
+        d->addAppData( userData );
+
+    // Generating an application ID used for identifying the shared memory
+    // block and QLocalServer
+    d->genBlockServerName();
+
+    // To mitigate QSharedMemory issues with large amount of processes
+    // attempting to attach at the same time
+    SingleApplicationPrivate::randomSleep();
+
+#ifdef Q_OS_UNIX
+    // By explicitly attaching it and then deleting it we make sure that the
+    // memory is deleted even after the process has crashed on Unix.
+    d->memory = new QSharedMemory( d->blockServerName );
+    d->memory->attach();
+    delete d->memory;
+#endif
+    // Guarantee thread safe behaviour with a shared memory block.
+    d->memory = new QSharedMemory( d->blockServerName );
+
+    // Create a shared memory block
+    if( d->memory->create( sizeof( InstancesInfo ) )){
+        // Initialize the shared memory block
+        if( ! d->memory->lock() ){
+          qCritical() << "SingleApplication: Unable to lock memory block after create.";
+          abortSafely();
+        }
+        d->initializeMemoryBlock();
+    } else {
+        if( d->memory->error() == QSharedMemory::AlreadyExists ){
+          // Attempt to attach to the memory segment
+          if( ! d->memory->attach() ){
+              qCritical() << "SingleApplication: Unable to attach to shared memory block.";
+              abortSafely();
+          }
+          if( ! d->memory->lock() ){
+            qCritical() << "SingleApplication: Unable to lock memory block after attach.";
+            abortSafely();
+          }
+        } else {
+          qCritical() << "SingleApplication: Unable to create block.";
+          abortSafely();
+        }
+    }
+
+    auto *inst = static_cast<InstancesInfo*>( d->memory->data() );
+    QElapsedTimer time;
+    time.start();
+
+    // Make sure the shared memory block is initialised and in consistent state
+    while( true ){
+      // If the shared memory block's checksum is valid continue
+      if( d->blockChecksum() == inst->checksum ) break;
+
+      // If more than 5s have elapsed, assume the primary instance crashed and
+      // assume it's position
+      if( time.elapsed() > 5000 ){
+          qWarning() << "SingleApplication: Shared memory block has been in an inconsistent state from more than 5s. Assuming primary instance failure.";
+          d->initializeMemoryBlock();
+      }
+
+      // Otherwise wait for a random period and try again. The random sleep here
+      // limits the probability of a collision between two racing apps and
+      // allows the app to initialise faster
+      if( ! d->memory->unlock() ){
+        qDebug() << "SingleApplication: Unable to unlock memory for random wait.";
+        qDebug() << d->memory->errorString();
+      }
+      SingleApplicationPrivate::randomSleep();
+      if( ! d->memory->lock() ){
+        qCritical() << "SingleApplication: Unable to lock memory after random wait.";
+        abortSafely();
+      }
+    }
+
+    if( inst->primary == false ){
+        d->startPrimary();
+        if( ! d->memory->unlock() ){
+          qDebug() << "SingleApplication: Unable to unlock memory after primary start.";
+          qDebug() << d->memory->errorString();
+        }
+        return;
+    }
+
+    // Check if another instance can be started
+    if( allowSecondary ){
+        d->startSecondary();
+        if( d->options & Mode::SecondaryNotification ){
+            d->connectToPrimary( timeout, SingleApplicationPrivate::SecondaryInstance );
+        }
+        if( ! d->memory->unlock() ){
+          qDebug() << "SingleApplication: Unable to unlock memory after secondary start.";
+          qDebug() << d->memory->errorString();
+        }
+        return;
+    }
+
+    if( ! d->memory->unlock() ){
+      qDebug() << "SingleApplication: Unable to unlock memory at end of execution.";
+      qDebug() << d->memory->errorString();
+    }
+
+    d->connectToPrimary( timeout, SingleApplicationPrivate::NewInstance );
+
+    delete d;
+
+    ::exit( EXIT_SUCCESS );
+}
+
+SingleApplication::~SingleApplication()
+{
+    Q_D( SingleApplication );
+    delete d;
+}
+
+/**
+ * Checks if the current application instance is primary.
+ * @return Returns true if the instance is primary, false otherwise.
+ */
+bool SingleApplication::isPrimary() const
+{
+    Q_D( const SingleApplication );
+    return d->server != nullptr;
+}
+
+/**
+ * Checks if the current application instance is secondary.
+ * @return Returns true if the instance is secondary, false otherwise.
+ */
+bool SingleApplication::isSecondary() const
+{
+    Q_D( const SingleApplication );
+    return d->server == nullptr;
+}
+
+/**
+ * Allows you to identify an instance by returning unique consecutive instance
+ * ids. It is reset when the first (primary) instance of your app starts and
+ * only incremented afterwards.
+ * @return Returns a unique instance id.
+ */
+quint32 SingleApplication::instanceId() const
+{
+    Q_D( const SingleApplication );
+    return d->instanceNumber;
+}
+
+/**
+ * Returns the OS PID (Process Identifier) of the process running the primary
+ * instance. Especially useful when SingleApplication is coupled with OS.
+ * specific APIs.
+ * @return Returns the primary instance PID.
+ */
+qint64 SingleApplication::primaryPid() const
+{
+    Q_D( const SingleApplication );
+    return d->primaryPid();
+}
+
+/**
+ * Returns the username the primary instance is running as.
+ * @return Returns the username the primary instance is running as.
+ */
+QString SingleApplication::primaryUser() const
+{
+    Q_D( const SingleApplication );
+    return d->primaryUser();
+}
+
+/**
+ * Returns the username the current instance is running as.
+ * @return Returns the username the current instance is running as.
+ */
+QString SingleApplication::currentUser() const
+{
+    return SingleApplicationPrivate::getUsername();
+}
+
+/**
+ * Sends message to the Primary Instance.
+ * @param message The message to send.
+ * @param timeout the maximum timeout in milliseconds for blocking functions.
+ * @return true if the message was sent successfuly, false otherwise.
+ */
+bool SingleApplication::sendMessage( const QByteArray &message, int timeout )
+{
+    Q_D( SingleApplication );
+
+    // Nobody to connect to
+    if( isPrimary() ) return false;
+
+    // Make sure the socket is connected
+    if( ! d->connectToPrimary( timeout,  SingleApplicationPrivate::Reconnect ) )
+      return false;
+
+    d->socket->write( message );
+    bool dataWritten = d->socket->waitForBytesWritten( timeout );
+    d->socket->flush();
+    return dataWritten;
+}
+
+/**
+ * Cleans up the shared memory block and exits with a failure.
+ * This function halts program execution.
+ */
+void SingleApplication::abortSafely()
+{
+    Q_D( SingleApplication );
+
+    qCritical() << "SingleApplication: " << d->memory->error() << d->memory->errorString();
+    delete d;
+    ::exit( EXIT_FAILURE );
+}
+
+QStringList SingleApplication::userData() const
+{
+    Q_D( const SingleApplication );
+    return d->appData();
+}
--- a/client/3rd/SingleApplication/singleapplication.h
+++ b/client/3rd/SingleApplication/singleapplication.h
@@ -0,0 +1,154 @@
+// The MIT License (MIT)
+//
+// Copyright (c) Itay Grudev 2015 - 2018
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#ifndef SINGLE_APPLICATION_H
+#define SINGLE_APPLICATION_H
+
+#include <QtCore/QtGlobal>
+#include <QtNetwork/QLocalSocket>
+
+#ifndef QAPPLICATION_CLASS
+  #define QAPPLICATION_CLASS QApplication
+#endif
+
+#include QT_STRINGIFY(QAPPLICATION_CLASS)
+
+class SingleApplicationPrivate;
+
+/**
+ * @brief The SingleApplication class handles multiple instances of the same
+ * Application
+ * @see QCoreApplication
+ */
+class SingleApplication : public QAPPLICATION_CLASS
+{
+    Q_OBJECT
+
+    using app_t = QAPPLICATION_CLASS;
+
+public:
+    /**
+     * @brief Mode of operation of SingleApplication.
+     * Whether the block should be user-wide or system-wide and whether the
+     * primary instance should be notified when a secondary instance had been
+     * started.
+     * @note Operating system can restrict the shared memory blocks to the same
+     * user, in which case the User/System modes will have no effect and the
+     * block will be user wide.
+     * @enum
+     */
+    enum Mode {
+        User                    = 1 << 0,
+        System                  = 1 << 1,
+        SecondaryNotification   = 1 << 2,
+        ExcludeAppVersion       = 1 << 3,
+        ExcludeAppPath          = 1 << 4
+    };
+    Q_DECLARE_FLAGS(Options, Mode)
+
+    /**
+     * @brief Intitializes a SingleApplication instance with argc command line
+     * arguments in argv
+     * @arg {int &} argc - Number of arguments in argv
+     * @arg {const char *[]} argv - Supplied command line arguments
+     * @arg {bool} allowSecondary - Whether to start the instance as secondary
+     * if there is already a primary instance.
+     * @arg {Mode} mode - Whether for the SingleApplication block to be applied
+     * User wide or System wide.
+     * @arg {int} timeout - Timeout to wait in milliseconds.
+     * @note argc and argv may be changed as Qt removes arguments that it
+     * recognizes
+     * @note Mode::SecondaryNotification only works if set on both the primary
+     * instance and the secondary instance.
+     * @note The timeout is just a hint for the maximum time of blocking
+     * operations. It does not guarantee that the SingleApplication
+     * initialisation will be completed in given time, though is a good hint.
+     * Usually 4*timeout would be the worst case (fail) scenario.
+     * @see See the corresponding QAPPLICATION_CLASS constructor for reference
+     */
+    explicit SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000, const QString &userData = {} );
+    ~SingleApplication() override;
+
+    /**
+     * @brief Returns if the instance is the primary instance
+     * @returns {bool}
+     */
+    bool isPrimary() const;
+
+    /**
+     * @brief Returns if the instance is a secondary instance
+     * @returns {bool}
+     */
+    bool isSecondary() const;
+
+    /**
+     * @brief Returns a unique identifier for the current instance
+     * @returns {qint32}
+     */
+    quint32 instanceId() const;
+
+    /**
+     * @brief Returns the process ID (PID) of the primary instance
+     * @returns {qint64}
+     */
+    qint64 primaryPid() const;
+
+    /**
+     * @brief Returns the username of the user running the primary instance
+     * @returns {QString}
+     */
+    QString primaryUser() const;
+
+    /**
+     * @brief Returns the username of the current user
+     * @returns {QString}
+     */
+    QString currentUser() const;
+
+    /**
+     * @brief Sends a message to the primary instance. Returns true on success.
+     * @param {int} timeout - Timeout for connecting
+     * @returns {bool}
+     * @note sendMessage() will return false if invoked from the primary
+     * instance.
+     */
+    bool sendMessage( const QByteArray &message, int timeout = 100 );
+
+    /**
+     * @brief Get the set user data.
+     * @returns {QStringList}
+     */
+    QStringList userData() const;
+
+Q_SIGNALS:
+    void instanceStarted();
+    void receivedMessage( quint32 instanceId, QByteArray message );
+
+private:
+    SingleApplicationPrivate *d_ptr;
+    Q_DECLARE_PRIVATE(SingleApplication)
+    void abortSafely();
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(SingleApplication::Options)
+
+#endif // SINGLE_APPLICATION_H
--- a/client/3rd/SingleApplication/singleapplication.pri
+++ b/client/3rd/SingleApplication/singleapplication.pri
@@ -0,0 +1,15 @@
+QT += core network
+CONFIG += c++11
+
+HEADERS +=  \
+    $$PWD/singleapplication.h \
+    $$PWD/singleapplication_p.h
+SOURCES += $$PWD/singleapplication.cpp \
+    $$PWD/singleapplication_p.cpp
+
+INCLUDEPATH += $$PWD
+
+win32 {
+    msvc:LIBS += Advapi32.lib
+    gcc:LIBS += -ladvapi32
+}
--- a/client/3rd/SingleApplication/singleapplication_p.cpp
+++ b/client/3rd/SingleApplication/singleapplication_p.cpp
@@ -0,0 +1,486 @@
+// The MIT License (MIT)
+//
+// Copyright (c) Itay Grudev 2015 - 2020
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+//
+//  W A R N I N G !!!
+//  -----------------
+//
+// This file is not part of the SingleApplication API. It is used purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or may even be removed.
+//
+
+#include <cstdlib>
+#include <cstddef>
+
+#include <QtCore/QDir>
+#include <QtCore/QThread>
+#include <QtCore/QByteArray>
+#include <QtCore/QDataStream>
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QCryptographicHash>
+#include <QtNetwork/QLocalServer>
+#include <QtNetwork/QLocalSocket>
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#include <QtCore/QRandomGenerator>
+#else
+#include <QtCore/QDateTime>
+#endif
+
+#include "singleapplication.h"
+#include "singleapplication_p.h"
+
+#ifdef Q_OS_UNIX
+    #include <unistd.h>
+    #include <sys/types.h>
+    #include <pwd.h>
+#endif
+
+#ifdef Q_OS_WIN
+    #ifndef NOMINMAX
+        #define NOMINMAX 1
+    #endif
+    #include <windows.h>
+    #include <lmcons.h>
+#endif
+
+SingleApplicationPrivate::SingleApplicationPrivate( SingleApplication *q_ptr )
+    : q_ptr( q_ptr )
+{
+    server = nullptr;
+    socket = nullptr;
+    memory = nullptr;
+    instanceNumber = 0;
+}
+
+SingleApplicationPrivate::~SingleApplicationPrivate()
+{
+    if( socket != nullptr ){
+        socket->close();
+        delete socket;
+    }
+
+    if( memory != nullptr ){
+        memory->lock();
+        auto *inst = static_cast<InstancesInfo*>(memory->data());
+        if( server != nullptr ){
+            server->close();
+            delete server;
+            inst->primary = false;
+            inst->primaryPid = -1;
+            inst->primaryUser[0] =  '\0';
+            inst->checksum = blockChecksum();
+        }
+        memory->unlock();
+
+        delete memory;
+    }
+}
+
+QString SingleApplicationPrivate::getUsername()
+{
+#ifdef Q_OS_WIN
+      wchar_t username[UNLEN + 1];
+      // Specifies size of the buffer on input
+      DWORD usernameLength = UNLEN + 1;
+      if( GetUserNameW( username, &usernameLength ) )
+          return QString::fromWCharArray( username );
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
+      return QString::fromLocal8Bit( qgetenv( "USERNAME" ) );
+#else
+      return qEnvironmentVariable( "USERNAME" );
+#endif
+#endif
+#ifdef Q_OS_UNIX
+      QString username;
+      uid_t uid = geteuid();
+      struct passwd *pw = getpwuid( uid );
+      if( pw )
+          username = QString::fromLocal8Bit( pw->pw_name );
+      if ( username.isEmpty() ){
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
+          username = QString::fromLocal8Bit( qgetenv( "USER" ) );
+#else
+          username = qEnvironmentVariable( "USER" );
+#endif
+      }
+      return username;
+#endif
+}
+
+void SingleApplicationPrivate::genBlockServerName()
+{
+    QCryptographicHash appData( QCryptographicHash::Sha256 );
+    appData.addData( "SingleApplication", 17 );
+    appData.addData( SingleApplication::app_t::applicationName().toUtf8() );
+    appData.addData( SingleApplication::app_t::organizationName().toUtf8() );
+    appData.addData( SingleApplication::app_t::organizationDomain().toUtf8() );
+
+    if ( ! appDataList.isEmpty() )
+        appData.addData( appDataList.join( "" ).toUtf8() );
+
+    if( ! (options & SingleApplication::Mode::ExcludeAppVersion) ){
+        appData.addData( SingleApplication::app_t::applicationVersion().toUtf8() );
+    }
+
+    if( ! (options & SingleApplication::Mode::ExcludeAppPath) ){
+#ifdef Q_OS_WIN
+        appData.addData( SingleApplication::app_t::applicationFilePath().toLower().toUtf8() );
+#else
+        appData.addData( SingleApplication::app_t::applicationFilePath().toUtf8() );
+#endif
+    }
+
+    // User level block requires a user specific data in the hash
+    if( options & SingleApplication::Mode::User ){
+        appData.addData( getUsername().toUtf8() );
+    }
+
+    // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with
+    // server naming requirements.
+    blockServerName = appData.result().toBase64().replace("/", "_");
+}
+
+void SingleApplicationPrivate::initializeMemoryBlock() const
+{
+    auto *inst = static_cast<InstancesInfo*>( memory->data() );
+    inst->primary = false;
+    inst->secondary = 0;
+    inst->primaryPid = -1;
+    inst->primaryUser[0] =  '\0';
+    inst->checksum = blockChecksum();
+}
+
+void SingleApplicationPrivate::startPrimary()
+{
+    // Reset the number of connections
+    auto *inst = static_cast <InstancesInfo*>( memory->data() );
+
+    inst->primary = true;
+    inst->primaryPid = QCoreApplication::applicationPid();
+    qstrncpy( inst->primaryUser, getUsername().toUtf8().data(), sizeof(inst->primaryUser) );
+    inst->checksum = blockChecksum();
+    instanceNumber = 0;
+    // Successful creation means that no main process exists
+    // So we start a QLocalServer to listen for connections
+    QLocalServer::removeServer( blockServerName );
+    server = new QLocalServer();
+
+    // Restrict access to the socket according to the
+    // SingleApplication::Mode::User flag on User level or no restrictions
+    if( options & SingleApplication::Mode::User ){
+        server->setSocketOptions( QLocalServer::UserAccessOption );
+    } else {
+        server->setSocketOptions( QLocalServer::WorldAccessOption );
+    }
+
+    server->listen( blockServerName );
+    QObject::connect(
+        server,
+        &QLocalServer::newConnection,
+        this,
+        &SingleApplicationPrivate::slotConnectionEstablished
+    );
+}
+
+void SingleApplicationPrivate::startSecondary()
+{
+  auto *inst = static_cast <InstancesInfo*>( memory->data() );
+
+  inst->secondary += 1;
+  inst->checksum = blockChecksum();
+  instanceNumber = inst->secondary;
+}
+
+bool SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType connectionType )
+{
+    QElapsedTimer time;
+    time.start();
+
+    // Connect to the Local Server of the Primary Instance if not already
+    // connected.
+    if( socket == nullptr ){
+        socket = new QLocalSocket();
+    }
+
+    if( socket->state() == QLocalSocket::ConnectedState ) return true;
+
+    if( socket->state() != QLocalSocket::ConnectedState ){
+
+        while( true ){
+            randomSleep();
+
+          if( socket->state() != QLocalSocket::ConnectingState )
+            socket->connectToServer( blockServerName );
+
+          if( socket->state() == QLocalSocket::ConnectingState ){
+              socket->waitForConnected( static_cast<int>(msecs - time.elapsed()) );
+          }
+
+          // If connected break out of the loop
+          if( socket->state() == QLocalSocket::ConnectedState ) break;
+
+          // If elapsed time since start is longer than the method timeout return
+          if( time.elapsed() >= msecs ) return false;
+        }
+    }
+
+    // Initialisation message according to the SingleApplication protocol
+    QByteArray initMsg;
+    QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+    writeStream.setVersion(QDataStream::Qt_5_6);
+#endif
+
+    writeStream << blockServerName.toLatin1();
+    writeStream << static_cast<quint8>(connectionType);
+    writeStream << instanceNumber;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    quint16 checksum = qChecksum(QByteArray(initMsg, static_cast<quint32>(initMsg.length())));
+#else
+    quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
+#endif
+    writeStream << checksum;
+
+    // The header indicates the message length that follows
+    QByteArray header;
+    QDataStream headerStream(&header, QIODevice::WriteOnly);
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+    headerStream.setVersion(QDataStream::Qt_5_6);
+#endif
+    headerStream << static_cast <quint64>( initMsg.length() );
+
+    socket->write( header );
+    socket->write( initMsg );
+    bool result = socket->waitForBytesWritten( static_cast<int>(msecs - time.elapsed()) );
+    socket->flush();
+    return result;
+}
+
+quint16 SingleApplicationPrivate::blockChecksum() const
+{
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory->constData()), offsetof(InstancesInfo, checksum)));
+#else
+    quint16 checksum = qChecksum(static_cast<const char*>(memory->constData()), offsetof(InstancesInfo, checksum));
+#endif
+    return checksum;
+}
+
+qint64 SingleApplicationPrivate::primaryPid() const
+{
+    qint64 pid;
+
+    memory->lock();
+    auto *inst = static_cast<InstancesInfo*>( memory->data() );
+    pid = inst->primaryPid;
+    memory->unlock();
+
+    return pid;
+}
+
+QString SingleApplicationPrivate::primaryUser() const
+{
+    QByteArray username;
+
+    memory->lock();
+    auto *inst = static_cast<InstancesInfo*>( memory->data() );
+    username = inst->primaryUser;
+    memory->unlock();
+
+    return QString::fromUtf8( username );
+}
+
+/**
+ * @brief Executed when a connection has been made to the LocalServer
+ */
+void SingleApplicationPrivate::slotConnectionEstablished()
+{
+    QLocalSocket *nextConnSocket = server->nextPendingConnection();
+    connectionMap.insert(nextConnSocket, ConnectionInfo());
+
+    QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose,
+        [nextConnSocket, this](){
+            auto &info = connectionMap[nextConnSocket];
+            Q_EMIT this->slotClientConnectionClosed( nextConnSocket, info.instanceId );
+        }
+    );
+
+    QObject::connect(nextConnSocket, &QLocalSocket::disconnected, nextConnSocket, &QLocalSocket::deleteLater);
+
+    QObject::connect(nextConnSocket, &QLocalSocket::destroyed,
+        [nextConnSocket, this](){
+            connectionMap.remove(nextConnSocket);
+        }
+    );
+
+    QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
+        [nextConnSocket, this](){
+            auto &info = connectionMap[nextConnSocket];
+            switch(info.stage){
+            case StageHeader:
+                readInitMessageHeader(nextConnSocket);
+                break;
+            case StageBody:
+                readInitMessageBody(nextConnSocket);
+                break;
+            case StageConnected:
+                Q_EMIT this->slotDataAvailable( nextConnSocket, info.instanceId );
+                break;
+            default:
+                break;
+            };
+        }
+    );
+}
+
+void SingleApplicationPrivate::readInitMessageHeader( QLocalSocket *sock )
+{
+    if (!connectionMap.contains( sock )){
+        return;
+    }
+
+    if( sock->bytesAvailable() < ( qint64 )sizeof( quint64 ) ){
+        return;
+    }
+
+    QDataStream headerStream( sock );
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+    headerStream.setVersion( QDataStream::Qt_5_6 );
+#endif
+
+    // Read the header to know the message length
+    quint64 msgLen = 0;
+    headerStream >> msgLen;
+    ConnectionInfo &info = connectionMap[sock];
+    info.stage = StageBody;
+    info.msgLen = msgLen;
+
+    if ( sock->bytesAvailable() >= (qint64) msgLen ){
+        readInitMessageBody( sock );
+    }
+}
+
+void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
+{
+    Q_Q(SingleApplication);
+
+    if (!connectionMap.contains( sock )){
+        return;
+    }
+
+    ConnectionInfo &info = connectionMap[sock];
+    if( sock->bytesAvailable() < ( qint64 )info.msgLen ){
+        return;
+    }
+
+    // Read the message body
+    QByteArray msgBytes = sock->read(info.msgLen);
+    QDataStream readStream(msgBytes);
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+    readStream.setVersion( QDataStream::Qt_5_6 );
+#endif
+
+    // server name
+    QByteArray latin1Name;
+    readStream >> latin1Name;
+
+    // connection type
+    ConnectionType connectionType = InvalidConnection;
+    quint8 connTypeVal = InvalidConnection;
+    readStream >> connTypeVal;
+    connectionType = static_cast <ConnectionType>( connTypeVal );
+
+    // instance id
+    quint32 instanceId = 0;
+    readStream >> instanceId;
+
+    // checksum
+    quint16 msgChecksum = 0;
+    readStream >> msgChecksum;
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    const quint16 actualChecksum = qChecksum(QByteArray(msgBytes, static_cast<quint32>(msgBytes.length() - sizeof(quint16))));
+#else
+    const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length() - sizeof(quint16)));
+#endif
+
+    bool isValid = readStream.status() == QDataStream::Ok &&
+                   QLatin1String(latin1Name) == blockServerName &&
+                   msgChecksum == actualChecksum;
+
+    if( !isValid ){
+        sock->close();
+        return;
+    }
+
+    info.instanceId = instanceId;
+    info.stage = StageConnected;
+
+    if( connectionType == NewInstance ||
+        ( connectionType == SecondaryInstance &&
+          options & SingleApplication::Mode::SecondaryNotification ) )
+    {
+        Q_EMIT q->instanceStarted();
+    }
+
+    if (sock->bytesAvailable() > 0){
+        Q_EMIT this->slotDataAvailable( sock, instanceId );
+    }
+}
+
+void SingleApplicationPrivate::slotDataAvailable( QLocalSocket *dataSocket, quint32 instanceId )
+{
+    Q_Q(SingleApplication);
+    Q_EMIT q->receivedMessage( instanceId, dataSocket->readAll() );
+}
+
+void SingleApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedSocket, quint32 instanceId )
+{
+    if( closedSocket->bytesAvailable() > 0 )
+        Q_EMIT slotDataAvailable( closedSocket, instanceId  );
+}
+
+void SingleApplicationPrivate::randomSleep()
+{
+#if QT_VERSION >= QT_VERSION_CHECK( 5, 10, 0 )
+    QThread::msleep( QRandomGenerator::global()->bounded( 8u, 18u ));
+#else
+    qsrand( QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max() );
+    QThread::msleep( 8 + static_cast <unsigned long>( static_cast <float>( qrand() ) / RAND_MAX * 10 ));
+#endif
+}
+
+void SingleApplicationPrivate::addAppData(const QString &data)
+{
+    appDataList.push_back(data);
+}
+
+QStringList SingleApplicationPrivate::appData() const
+{
+    return appDataList;
+}
--- a/client/3rd/SingleApplication/singleapplication_p.h
+++ b/client/3rd/SingleApplication/singleapplication_p.h
@@ -0,0 +1,104 @@
+// The MIT License (MIT)
+//
+// Copyright (c) Itay Grudev 2015 - 2020
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+//
+//  W A R N I N G !!!
+//  -----------------
+//
+// This file is not part of the SingleApplication API. It is used purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or may even be removed.
+//
+
+#ifndef SINGLEAPPLICATION_P_H
+#define SINGLEAPPLICATION_P_H
+
+#include <QtCore/QSharedMemory>
+#include <QtNetwork/QLocalServer>
+#include <QtNetwork/QLocalSocket>
+#include "singleapplication.h"
+
+struct InstancesInfo {
+    bool primary;
+    quint32 secondary;
+    qint64 primaryPid;
+    char primaryUser[128];
+    quint16 checksum; // Must be the last field
+};
+
+struct ConnectionInfo {
+    qint64 msgLen = 0;
+    quint32 instanceId = 0;
+    quint8 stage = 0;
+};
+
+class SingleApplicationPrivate : public QObject {
+Q_OBJECT
+public:
+    enum ConnectionType : quint8 {
+        InvalidConnection = 0,
+        NewInstance = 1,
+        SecondaryInstance = 2,
+        Reconnect = 3
+    };
+    enum ConnectionStage : quint8 {
+        StageHeader = 0,
+        StageBody = 1,
+        StageConnected = 2,
+    };
+    Q_DECLARE_PUBLIC(SingleApplication)
+
+    SingleApplicationPrivate( SingleApplication *q_ptr );
+    ~SingleApplicationPrivate() override;
+
+    static QString getUsername();
+    void genBlockServerName();
+    void initializeMemoryBlock() const;
+    void startPrimary();
+    void startSecondary();
+    bool connectToPrimary( int msecs, ConnectionType connectionType );
+    quint16 blockChecksum() const;
+    qint64 primaryPid() const;
+    QString primaryUser() const;
+    void readInitMessageHeader(QLocalSocket *socket);
+    void readInitMessageBody(QLocalSocket *socket);
+    static void randomSleep();
+    void addAppData(const QString &data);
+    QStringList appData() const;
+
+    SingleApplication *q_ptr;
+    QSharedMemory *memory;
+    QLocalSocket *socket;
+    QLocalServer *server;
+    quint32 instanceNumber;
+    QString blockServerName;
+    SingleApplication::Options options;
+    QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+    QStringList appDataList;
+
+public Q_SLOTS:
+    void slotConnectionEstablished();
+    void slotDataAvailable( QLocalSocket*, quint32 );
+    void slotClientConnectionClosed( QLocalSocket*, quint32 );
+};
+
+#endif // SINGLEAPPLICATION_P_H
--- a/client/3rd/amneziawg-apple
+++ b/client/3rd/amneziawg-apple
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -25,14 +25,14 @@ execute_process(
 add_definitions(-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}")

 add_definitions(-DPROD_AGW_PUBLIC_KEY="$ENV{PROD_AGW_PUBLIC_KEY}")
-add_definitions(-DPROD_S3_ENDPOINT="$ENV{PROD_S3_ENDPOINT}")
+add_definitions(-DPROD_PROXY_STORAGE_KEY="$ENV{PROD_PROXY_STORAGE_KEY}")

 add_definitions(-DDEV_AGW_PUBLIC_KEY="$ENV{DEV_AGW_PUBLIC_KEY}")
 add_definitions(-DDEV_AGW_ENDPOINT="$ENV{DEV_AGW_ENDPOINT}")
-add_definitions(-DDEV_S3_ENDPOINT="$ENV{DEV_S3_ENDPOINT}")

-add_definitions(-DFREE_V2_ENDPOINT="$ENV{FREE_V2_ENDPOINT}")
-add_definitions(-DPREM_V1_ENDPOINT="$ENV{PREM_V1_ENDPOINT}")
+if(IOS)
+    set(PACKAGES ${PACKAGES} Multimedia)
+endif()

 if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
    set(PACKAGES ${PACKAGES} Widgets)
@@ -47,6 +47,10 @@ set(LIBS ${LIBS}
    Qt6::Core5Compat Qt6::Concurrent
 )

+if(IOS)
+    set(LIBS ${LIBS} Qt6::Multimedia)
+endif()
+
 if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
    set(LIBS ${LIBS} Qt6::Widgets)
 endif()
@@ -57,7 +61,6 @@ qt_add_executable(${PROJECT} MANUAL_FINALIZATION)
 if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
    qt_add_repc_replicas(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../ipc/ipc_interface.rep)
    qt_add_repc_replicas(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../ipc/ipc_process_interface.rep)
-    qt_add_repc_replicas(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}/../ipc/ipc_process_tun2socks.rep)
 endif()

 qt6_add_resources(QRC ${QRC} ${CMAKE_CURRENT_LIST_DIR}/resources.qrc)
@@ -91,6 +94,11 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/translations/translations.qrc.in ${CMAK
 qt6_add_resources(QRC ${I18NQRC} ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
 # -- i18n end

+if(IOS)
+    execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/ios/scripts/openvpn.sh args
+        WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+endif()
+
 set(IS_CI ${CI})
 if(IS_CI)
    message("Detected CI env")
@@ -100,8 +108,8 @@ if(IS_CI)
    endif()
 endif()

+
 include(${CMAKE_CURRENT_LIST_DIR}/cmake/3rdparty.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/cmake/sources.cmake)

 include_directories(
    ${CMAKE_CURRENT_LIST_DIR}/../ipc
@@ -110,22 +118,165 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
 )

+configure_file(${CMAKE_CURRENT_LIST_DIR}/../version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
+set(HEADERS ${HEADERS}
+    ${CMAKE_CURRENT_LIST_DIR}/migrations.h
+    ${CMAKE_CURRENT_LIST_DIR}/../ipc/ipc.h
+    ${CMAKE_CURRENT_LIST_DIR}/amnezia_application.h
+    ${CMAKE_CURRENT_LIST_DIR}/containers/containers_defs.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/defs.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/errorstrings.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/scripts_registry.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/server_defs.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/controllers/apiController.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/controllers/serverController.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/controllers/vpnConfigurationController.h
+    ${CMAKE_CURRENT_LIST_DIR}/protocols/protocols_defs.h
+    ${CMAKE_CURRENT_LIST_DIR}/protocols/qml_register_protocols.h
+    ${CMAKE_CURRENT_LIST_DIR}/ui/pages.h
+    ${CMAKE_CURRENT_LIST_DIR}/ui/qautostart.h
+    ${CMAKE_CURRENT_LIST_DIR}/protocols/vpnprotocol.h
+    ${CMAKE_CURRENT_BINARY_DIR}/version.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/sshclient.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/networkUtilities.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/serialization.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/transfer.h
+    ${CMAKE_CURRENT_LIST_DIR}/core/enums/apiEnums.h
+    ${CMAKE_CURRENT_LIST_DIR}/../common/logger/logger.h
+)
+
+# Mozilla headres
+set(HEADERS ${HEADERS}
+    ${CMAKE_CURRENT_LIST_DIR}/mozilla/models/server.h
+    ${CMAKE_CURRENT_LIST_DIR}/mozilla/shared/ipaddress.h
+    ${CMAKE_CURRENT_LIST_DIR}/mozilla/shared/leakdetector.h
+    ${CMAKE_CURRENT_LIST_DIR}/mozilla/controllerimpl.h
+    ${CMAKE_CURRENT_LIST_DIR}/mozilla/localsocketcontroller.h
+)
+
 include_directories(mozilla)
 include_directories(mozilla/shared)
 include_directories(mozilla/models)

-configure_file(${CMAKE_CURRENT_LIST_DIR}/../version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+if(NOT IOS)
+    set(HEADERS ${HEADERS}
+        ${CMAKE_CURRENT_LIST_DIR}/platforms/ios/QRCodeReaderBase.h
+    )
+endif()
+
+if(NOT ANDROID)
+    set(HEADERS ${HEADERS}
+        ${CMAKE_CURRENT_LIST_DIR}/ui/notificationhandler.h
+    )
+endif()
+
+set(SOURCES ${SOURCES}
+    ${CMAKE_CURRENT_LIST_DIR}/migrations.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/amnezia_application.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/containers/containers_defs.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/errorstrings.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/scripts_registry.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/server_defs.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/controllers/apiController.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/controllers/serverController.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/controllers/vpnConfigurationController.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/protocols/protocols_defs.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/ui/qautostart.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/protocols/vpnprotocol.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/sshclient.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/networkUtilities.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/outbound.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/inbound.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/ss.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/ssd.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/vless.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/trojan.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/vmess.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/core/serialization/vmess_new.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../common/logger/logger.cpp
+)
+
+# Mozilla sources
+set(SOURCES ${SOURCES}
+    ${CMAKE_CURRENT_LIST_DIR}/mozilla/models/server.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/mozilla/shared/ipaddress.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/mozilla/shared/leakdetector.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/mozilla/localsocketcontroller.cpp
+)

 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
    target_compile_definitions(${PROJECT} PRIVATE "MZ_DEBUG")
 endif()

+if(NOT IOS)
+    set(SOURCES ${SOURCES}
+        ${CMAKE_CURRENT_LIST_DIR}/platforms/ios/QRCodeReaderBase.cpp
+    )
+endif()
+
+if(NOT ANDROID)
+    set(SOURCES ${SOURCES}
+        ${CMAKE_CURRENT_LIST_DIR}/ui/notificationhandler.cpp
+    )
+endif()
+
+file(GLOB COMMON_FILES_H CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/*.h)
+file(GLOB COMMON_FILES_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/*.cpp)
+
+file(GLOB_RECURSE PAGE_LOGIC_H CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/pages_logic/*.h)
+file(GLOB_RECURSE PAGE_LOGIC_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/pages_logic/*.cpp)
+
+file(GLOB CONFIGURATORS_H CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/configurators/*.h)
+file(GLOB CONFIGURATORS_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/configurators/*.cpp)
+
+file(GLOB UI_MODELS_H CONFIGURE_DEPENDS
+    ${CMAKE_CURRENT_LIST_DIR}/ui/models/*.h
+    ${CMAKE_CURRENT_LIST_DIR}/ui/models/protocols/*.h
+    ${CMAKE_CURRENT_LIST_DIR}/ui/models/services/*.h
+)
+file(GLOB UI_MODELS_CPP CONFIGURE_DEPENDS
+    ${CMAKE_CURRENT_LIST_DIR}/ui/models/*.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/ui/models/protocols/*.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/ui/models/services/*.cpp
+)
+
+file(GLOB UI_CONTROLLERS_H CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/controllers/*.h)
+file(GLOB UI_CONTROLLERS_CPP CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/ui/controllers/*.cpp)
+
+set(HEADERS ${HEADERS}
+    ${COMMON_FILES_H}
+    ${PAGE_LOGIC_H}
+    ${CONFIGURATORS_H}
+    ${UI_MODELS_H}
+    ${UI_CONTROLLERS_H}
+)
+set(SOURCES ${SOURCES}
+    ${COMMON_FILES_CPP}
+    ${PAGE_LOGIC_CPP}
+    ${CONFIGURATORS_CPP}
+    ${UI_MODELS_CPP}
+    ${UI_CONTROLLERS_CPP}
+)
+
 if(WIN32)
    configure_file(
        ${CMAKE_CURRENT_LIST_DIR}/platforms/windows/amneziavpn.rc.in
        ${CMAKE_CURRENT_BINARY_DIR}/amneziavpn.rc
    )

+    set(HEADERS ${HEADERS}
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/ikev2_vpn_protocol_windows.h
+    )
+
+    set(SOURCES ${SOURCES}
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/ikev2_vpn_protocol_windows.cpp
+    )
+
+    set(RESOURCES ${RESOURCES}
+        ${CMAKE_CURRENT_BINARY_DIR}/amneziavpn.rc
+    )
+
    set(LIBS ${LIBS}
        user32
        rasapi32
@@ -169,6 +320,30 @@ endif()
 if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
    message("Client desktop build")
    add_compile_definitions(AMNEZIA_DESKTOP)
+
+    set(HEADERS ${HEADERS}
+        ${CMAKE_CURRENT_LIST_DIR}/core/ipcclient.h
+        ${CMAKE_CURRENT_LIST_DIR}/core/privileged_process.h
+        ${CMAKE_CURRENT_LIST_DIR}/ui/systemtray_notificationhandler.h
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/openvpnprotocol.h
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/openvpnovercloakprotocol.h
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/shadowsocksvpnprotocol.h
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/wireguardprotocol.h
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/xrayprotocol.h
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/awgprotocol.h
+    )
+
+    set(SOURCES ${SOURCES}
+        ${CMAKE_CURRENT_LIST_DIR}/core/ipcclient.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/core/privileged_process.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/ui/systemtray_notificationhandler.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/openvpnprotocol.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/openvpnovercloakprotocol.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/shadowsocksvpnprotocol.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/wireguardprotocol.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/xrayprotocol.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/protocols/awgprotocol.cpp
+    )
 endif()

 if(ANDROID)
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -2,8 +2,6 @@

 #include <QClipboard>
 #include <QFontDatabase>
-#include <QLocalServer>
-#include <QLocalSocket>
 #include <QMimeData>
 #include <QQuickItem>
 #include <QQuickStyle>
@@ -14,15 +12,28 @@
 #include <QTranslator>

 #include "logger.h"
-#include "ui/controllers/pageController.h"
 #include "ui/models/installedAppsModel.h"
 #include "version.h"

 #include "platforms/ios/QRCodeReaderBase.h"
+#if defined(Q_OS_ANDROID)
+    #include "core/installedAppsImageProvider.h"
+    #include "platforms/android/android_controller.h"
+#endif

 #include "protocols/qml_register_protocols.h"

+#if defined(Q_OS_IOS)
+    #include "platforms/ios/ios_controller.h"
+    #include <AmneziaVPN-Swift.h>
+#endif
+
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
 AmneziaApplication::AmneziaApplication(int &argc, char *argv[]) : AMNEZIA_BASE_CLASS(argc, argv)
+#else
+AmneziaApplication::AmneziaApplication(int &argc, char *argv[])
+    : QApplication(argc, argv)
+#endif
 {
    setQuitOnLastWindowClosed(false);

@@ -76,12 +87,78 @@ void AmneziaApplication::init()
    m_vpnConnection->moveToThread(&m_vpnConnectionThread);
    m_vpnConnectionThread.start();

-    m_coreController.reset(new CoreController(m_vpnConnection, m_settings, m_engine));
+    initModels();
+    loadTranslator();
+    initControllers();
+
+#ifdef Q_OS_ANDROID
+    if (!AndroidController::initLogging()) {
+        qFatal("Android logging initialization failed");
+    }
+    AndroidController::instance()->setSaveLogs(m_settings->isSaveLogs());
+    connect(m_settings.get(), &Settings::saveLogsChanged, AndroidController::instance(), &AndroidController::setSaveLogs);
+
+    AndroidController::instance()->setScreenshotsEnabled(m_settings->isScreenshotsEnabled());
+    connect(m_settings.get(), &Settings::screenshotsEnabledChanged, AndroidController::instance(), &AndroidController::setScreenshotsEnabled);
+
+    connect(m_settings.get(), &Settings::serverRemoved, AndroidController::instance(), &AndroidController::resetLastServer);
+
+    connect(m_settings.get(), &Settings::settingsCleared, []() { AndroidController::instance()->resetLastServer(-1); });
+
+    connect(AndroidController::instance(), &AndroidController::initConnectionState, this, [this](Vpn::ConnectionState state) {
+        m_connectionController->onConnectionStateChanged(state);
+        if (m_vpnConnection)
+            m_vpnConnection->restoreConnection();
+    });
+    if (!AndroidController::instance()->initialize()) {
+        qFatal("Android controller initialization failed");
+    }
+
+    connect(AndroidController::instance(), &AndroidController::importConfigFromOutside, [this](QString data) {
+        m_pageController->goToPageHome();
+        m_importController->extractConfigFromData(data);
+        m_pageController->goToPageViewConfig();
+    });
+
+    m_engine->addImageProvider(QLatin1String("installedAppImage"), new InstalledAppsImageProvider);
+#endif
+
+#ifdef Q_OS_IOS
+    IosController::Instance()->initialize();
+    connect(IosController::Instance(), &IosController::importConfigFromOutside, [this](QString data) {
+        m_pageController->goToPageHome();
+        m_importController->extractConfigFromData(data);
+        m_pageController->goToPageViewConfig();
+    });
+
+    connect(IosController::Instance(), &IosController::importBackupFromOutside, [this](QString filePath) {
+        m_pageController->goToPageHome();
+        m_pageController->goToPageSettingsBackup();
+        m_settingsController->importBackupFromOutside(filePath);
+    });
+
+    QTimer::singleShot(0, this, [this]() { AmneziaVPN::toggleScreenshots(m_settings->isScreenshotsEnabled()); });
+
+    connect(m_settings.get(), &Settings::screenshotsEnabledChanged, [](bool enabled) { AmneziaVPN::toggleScreenshots(enabled); });
+#endif
+
+#ifndef Q_OS_ANDROID
+    m_notificationHandler.reset(NotificationHandler::create(nullptr));
+
+    connect(m_vpnConnection.get(), &VpnConnection::connectionStateChanged, m_notificationHandler.get(),
+            &NotificationHandler::setConnectionState);
+
+    connect(m_notificationHandler.get(), &NotificationHandler::raiseRequested, m_pageController.get(), &PageController::raiseMainWindow);
+    connect(m_notificationHandler.get(), &NotificationHandler::connectRequested, m_connectionController.get(),
+            static_cast<void (ConnectionController::*)()>(&ConnectionController::openConnection));
+    connect(m_notificationHandler.get(), &NotificationHandler::disconnectRequested, m_connectionController.get(),
+            &ConnectionController::closeConnection);
+    connect(this, &AmneziaApplication::translationsUpdated, m_notificationHandler.get(), &NotificationHandler::onTranslationsUpdated);
+#endif

    m_engine->addImportPath("qrc:/ui/qml/Modules/");
    m_engine->load(url);
-
-    m_coreController->setQmlRoot();
+    m_systemController->setQmlRoot(m_engine->rootObjects().value(0));

    bool enabled = m_settings->isSaveLogs();
 #ifndef Q_OS_ANDROID
@@ -93,15 +170,25 @@ void AmneziaApplication::init()
 #endif
    Logger::setServiceLogsEnabled(enabled);

-#ifdef Q_OS_WIN //TODO
+#ifdef Q_OS_WIN
    if (m_parser.isSet("a"))
-        m_coreController->pageController()->showOnStartup();
+        m_pageController->showOnStartup();
    else
-        emit m_coreController->pageController()->raiseMainWindow();
+        emit m_pageController->raiseMainWindow();
 #else
-    m_coreController->pageController()->showOnStartup();
+    m_pageController->showOnStartup();
 #endif

+        // TODO - fix
+// #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+//     if (isPrimary()) {
+//         QObject::connect(this, &SingleApplication::instanceStarted, m_pageController.get(), [this]() {
+//             qDebug() << "Secondary instance started, showing this window instead";
+//             emit m_pageController->raiseMainWindow();
+//         });
+//     }
+// #endif
+
 // Android TextArea clipboard workaround
 // Text from TextArea always has "text/html" mime-type:
 // /qt/6.6.1/Src/qtdeclarative/src/quick/items/qquicktextcontrol.cpp:1865
@@ -156,6 +243,33 @@ void AmneziaApplication::loadFonts()
    QFontDatabase::addApplicationFont(":/fonts/pt-root-ui_vf.ttf");
 }

+void AmneziaApplication::loadTranslator()
+{
+    auto locale = m_settings->getAppLanguage();
+    m_translator.reset(new QTranslator());
+    updateTranslator(locale);
+}
+
+void AmneziaApplication::updateTranslator(const QLocale &locale)
+{
+    if (!m_translator->isEmpty()) {
+        QCoreApplication::removeTranslator(m_translator.get());
+    }
+
+    QString strFileName = QString(":/translations/amneziavpn") + QLatin1String("_") + locale.name() + ".qm";
+    if (m_translator->load(strFileName)) {
+        if (QCoreApplication::installTranslator(m_translator.get())) {
+            m_settings->setAppLanguage(locale);
+        }
+    } else {
+        m_settings->setAppLanguage(QLocale::English);
+    }
+
+    m_engine->retranslate();
+
+    emit translationsUpdated();
+}
+
 bool AmneziaApplication::parseCommands()
 {
    m_parser.setApplicationDescription(APPLICATION_NAME);
@@ -179,36 +293,165 @@ bool AmneziaApplication::parseCommands()
    return true;
 }

-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-void AmneziaApplication::startLocalServer()
-{
-    const QString serverName("AmneziaVPNInstance");
-    QLocalServer::removeServer(serverName);
-
-    QLocalServer *server = new QLocalServer(this);
-    server->listen(serverName);
-
-    QObject::connect(server, &QLocalServer::newConnection, this, [server, this]() {
-        if (server) {
-            QLocalSocket *clientConnection = server->nextPendingConnection();
-            clientConnection->deleteLater();
-        }
-        emit m_coreController->pageController()->raiseMainWindow(); //TODO
-    });
-}
-#endif
-
 QQmlApplicationEngine *AmneziaApplication::qmlEngine() const
 {
    return m_engine;
 }

-QNetworkAccessManager *AmneziaApplication::networkManager()
+void AmneziaApplication::initModels()
 {
-    return m_nam;
+    m_containersModel.reset(new ContainersModel(this));
+    m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());
+
+    m_defaultServerContainersModel.reset(new ContainersModel(this));
+    m_engine->rootContext()->setContextProperty("DefaultServerContainersModel", m_defaultServerContainersModel.get());
+
+    m_serversModel.reset(new ServersModel(m_settings, this));
+    m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
+    connect(m_serversModel.get(), &ServersModel::containersUpdated, m_containersModel.get(), &ContainersModel::updateModel);
+    connect(m_serversModel.get(), &ServersModel::defaultServerContainersUpdated, m_defaultServerContainersModel.get(),
+            &ContainersModel::updateModel);
+    m_serversModel->resetModel();
+
+    m_languageModel.reset(new LanguageModel(m_settings, this));
+    m_engine->rootContext()->setContextProperty("LanguageModel", m_languageModel.get());
+    connect(m_languageModel.get(), &LanguageModel::updateTranslations, this, &AmneziaApplication::updateTranslator);
+    connect(this, &AmneziaApplication::translationsUpdated, m_languageModel.get(), &LanguageModel::translationsUpdated);
+
+    m_sitesModel.reset(new SitesModel(m_settings, this));
+    m_engine->rootContext()->setContextProperty("SitesModel", m_sitesModel.get());
+
+    m_appSplitTunnelingModel.reset(new AppSplitTunnelingModel(m_settings, this));
+    m_engine->rootContext()->setContextProperty("AppSplitTunnelingModel", m_appSplitTunnelingModel.get());
+
+    m_protocolsModel.reset(new ProtocolsModel(m_settings, this));
+    m_engine->rootContext()->setContextProperty("ProtocolsModel", m_protocolsModel.get());
+
+    m_openVpnConfigModel.reset(new OpenVpnConfigModel(this));
+    m_engine->rootContext()->setContextProperty("OpenVpnConfigModel", m_openVpnConfigModel.get());
+
+    m_shadowSocksConfigModel.reset(new ShadowSocksConfigModel(this));
+    m_engine->rootContext()->setContextProperty("ShadowSocksConfigModel", m_shadowSocksConfigModel.get());
+
+    m_cloakConfigModel.reset(new CloakConfigModel(this));
+    m_engine->rootContext()->setContextProperty("CloakConfigModel", m_cloakConfigModel.get());
+
+    m_wireGuardConfigModel.reset(new WireGuardConfigModel(this));
+    m_engine->rootContext()->setContextProperty("WireGuardConfigModel", m_wireGuardConfigModel.get());
+
+    m_awgConfigModel.reset(new AwgConfigModel(this));
+    m_engine->rootContext()->setContextProperty("AwgConfigModel", m_awgConfigModel.get());
+
+    m_xrayConfigModel.reset(new XrayConfigModel(this));
+    m_engine->rootContext()->setContextProperty("XrayConfigModel", m_xrayConfigModel.get());
+
+#ifdef Q_OS_WINDOWS
+    m_ikev2ConfigModel.reset(new Ikev2ConfigModel(this));
+    m_engine->rootContext()->setContextProperty("Ikev2ConfigModel", m_ikev2ConfigModel.get());
+#endif
+
+    m_sftpConfigModel.reset(new SftpConfigModel(this));
+    m_engine->rootContext()->setContextProperty("SftpConfigModel", m_sftpConfigModel.get());
+
+    m_socks5ConfigModel.reset(new Socks5ProxyConfigModel(this));
+    m_engine->rootContext()->setContextProperty("Socks5ProxyConfigModel", m_socks5ConfigModel.get());
+
+    m_clientManagementModel.reset(new ClientManagementModel(m_settings, this));
+    m_engine->rootContext()->setContextProperty("ClientManagementModel", m_clientManagementModel.get());
+    connect(m_clientManagementModel.get(), &ClientManagementModel::adminConfigRevoked, m_serversModel.get(),
+            &ServersModel::clearCachedProfile);
+
+    m_apiServicesModel.reset(new ApiServicesModel(this));
+    m_engine->rootContext()->setContextProperty("ApiServicesModel", m_apiServicesModel.get());
+
+    m_apiCountryModel.reset(new ApiCountryModel(this));
+    m_engine->rootContext()->setContextProperty("ApiCountryModel", m_apiCountryModel.get());
+    connect(m_serversModel.get(), &ServersModel::updateApiLanguageModel, this, [this]() {
+        m_apiCountryModel->updateModel(m_serversModel->getProcessedServerData("apiAvailableCountries").toJsonArray(),
+                                       m_serversModel->getProcessedServerData("apiServerCountryCode").toString());
+    });
+    connect(m_serversModel.get(), &ServersModel::updateApiServicesModel, this,
+            [this]() { m_apiServicesModel->updateModel(m_serversModel->getProcessedServerData("apiConfig").toJsonObject()); });
 }

-QClipboard *AmneziaApplication::getClipboard()
+void AmneziaApplication::initControllers()
 {
-    return this->clipboard();
+    m_connectionController.reset(
+            new ConnectionController(m_serversModel, m_containersModel, m_clientManagementModel, m_vpnConnection, m_settings));
+    m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
+
+    connect(m_connectionController.get(), qOverload<const QString &>(&ConnectionController::connectionErrorOccurred), this,
+            [this](const QString &errorMessage) {
+                emit m_pageController->showErrorMessage(errorMessage);
+                emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Disconnected);
+            });
+
+    connect(m_connectionController.get(), qOverload<ErrorCode>(&ConnectionController::connectionErrorOccurred), this,
+            [this](ErrorCode errorCode) {
+                emit m_pageController->showErrorMessage(errorCode);
+                emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Disconnected);
+            });
+
+    connect(m_connectionController.get(), &ConnectionController::connectButtonClicked, m_connectionController.get(),
+            &ConnectionController::toggleConnection, Qt::QueuedConnection);
+
+    m_pageController.reset(new PageController(m_serversModel, m_settings));
+    m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
+
+    m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_protocolsModel, m_clientManagementModel,
+                                                    m_apiServicesModel, m_settings));
+    m_engine->rootContext()->setContextProperty("InstallController", m_installController.get());
+    connect(m_installController.get(), &InstallController::passphraseRequestStarted, m_pageController.get(),
+            &PageController::showPassphraseRequestDrawer);
+    connect(m_pageController.get(), &PageController::passphraseRequestDrawerClosed, m_installController.get(),
+            &InstallController::setEncryptedPassphrase);
+    connect(m_installController.get(), &InstallController::currentContainerUpdated, m_connectionController.get(),
+            &ConnectionController::onCurrentContainerUpdated);
+
+    connect(m_installController.get(), &InstallController::updateServerFromApiFinished, this, [this]() {
+        disconnect(m_reloadConfigErrorOccurredConnection);
+        emit m_connectionController->configFromApiUpdated();
+    });
+
+    connect(m_connectionController.get(), &ConnectionController::updateApiConfigFromGateway, this, [this]() {
+        m_reloadConfigErrorOccurredConnection = connect(
+                m_installController.get(), qOverload<ErrorCode>(&InstallController::installationErrorOccurred), this,
+                [this]() { emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Disconnected); },
+                static_cast<Qt::ConnectionType>(Qt::AutoConnection || Qt::SingleShotConnection));
+        m_installController->updateServiceFromApi(m_serversModel->getDefaultServerIndex(), "", "");
+    });
+
+    connect(m_connectionController.get(), &ConnectionController::updateApiConfigFromTelegram, this, [this]() {
+        m_reloadConfigErrorOccurredConnection = connect(
+                m_installController.get(), qOverload<ErrorCode>(&InstallController::installationErrorOccurred), this,
+                [this]() { emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Disconnected); },
+                static_cast<Qt::ConnectionType>(Qt::AutoConnection || Qt::SingleShotConnection));
+        m_serversModel->removeApiConfig(m_serversModel->getDefaultServerIndex());
+        m_installController->updateServiceFromTelegram(m_serversModel->getDefaultServerIndex());
+    });
+
+    connect(this, &AmneziaApplication::translationsUpdated, m_connectionController.get(), &ConnectionController::onTranslationsUpdated);
+
+    m_importController.reset(new ImportController(m_serversModel, m_containersModel, m_settings));
+    m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());
+
+    m_exportController.reset(new ExportController(m_serversModel, m_containersModel, m_clientManagementModel, m_settings));
+    m_engine->rootContext()->setContextProperty("ExportController", m_exportController.get());
+
+    m_settingsController.reset(
+            new SettingsController(m_serversModel, m_containersModel, m_languageModel, m_sitesModel, m_appSplitTunnelingModel, m_settings));
+    m_engine->rootContext()->setContextProperty("SettingsController", m_settingsController.get());
+    if (m_settingsController->isAutoConnectEnabled() && m_serversModel->getDefaultServerIndex() >= 0) {
+        QTimer::singleShot(1000, this, [this]() { m_connectionController->openConnection(); });
+    }
+    connect(m_settingsController.get(), &SettingsController::amneziaDnsToggled, m_serversModel.get(), &ServersModel::toggleAmneziaDns);
+
+    m_sitesController.reset(new SitesController(m_settings, m_vpnConnection, m_sitesModel));
+    m_engine->rootContext()->setContextProperty("SitesController", m_sitesController.get());
+
+    m_appSplitTunnelingController.reset(new AppSplitTunnelingController(m_settings, m_appSplitTunnelingModel));
+    m_engine->rootContext()->setContextProperty("AppSplitTunnelingController", m_appSplitTunnelingController.get());
+
+    m_systemController.reset(new SystemController(m_settings));
+    m_engine->rootContext()->setContextProperty("SystemController", m_systemController.get());
 }
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -11,55 +11,132 @@
 #else
    #include <QApplication>
 #endif
-#include <QClipboard>

-#include "core/controllers/coreController.h"
 #include "settings.h"
 #include "vpnconnection.h"

+#include "ui/controllers/connectionController.h"
+#include "ui/controllers/exportController.h"
+#include "ui/controllers/importController.h"
+#include "ui/controllers/installController.h"
+#include "ui/controllers/pageController.h"
+#include "ui/controllers/settingsController.h"
+#include "ui/controllers/sitesController.h"
+#include "ui/controllers/systemController.h"
+#include "ui/controllers/appSplitTunnelingController.h"
+#include "ui/models/containers_model.h"
+#include "ui/models/languageModel.h"
+#include "ui/models/protocols/cloakConfigModel.h"
+#ifndef Q_OS_ANDROID
+    #include "ui/notificationhandler.h"
+#endif
+#ifdef Q_OS_WINDOWS
+    #include "ui/models/protocols/ikev2ConfigModel.h"
+#endif
+#include "ui/models/protocols/awgConfigModel.h"
+#include "ui/models/protocols/openvpnConfigModel.h"
+#include "ui/models/protocols/shadowsocksConfigModel.h"
+#include "ui/models/protocols/wireguardConfigModel.h"
+#include "ui/models/protocols/xrayConfigModel.h"
+#include "ui/models/protocols_model.h"
+#include "ui/models/servers_model.h"
+#include "ui/models/services/sftpConfigModel.h"
+#include "ui/models/services/socks5ProxyConfigModel.h"
+#include "ui/models/sites_model.h"
+#include "ui/models/clientManagementModel.h"
+#include "ui/models/appSplitTunnelingModel.h"
+#include "ui/models/apiServicesModel.h"
+#include "ui/models/apiCountryModel.h"
+
 #define amnApp (static_cast<AmneziaApplication *>(QCoreApplication::instance()))

 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
    #define AMNEZIA_BASE_CLASS QGuiApplication
 #else
    #define AMNEZIA_BASE_CLASS QApplication
+    #define QAPPLICATION_CLASS QApplication
 #endif

 class AmneziaApplication : public AMNEZIA_BASE_CLASS
 {
    Q_OBJECT
 public:
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
    AmneziaApplication(int &argc, char *argv[]);
+#else
+    AmneziaApplication(int &argc, char *argv[]);
+#endif
    virtual ~AmneziaApplication();

    void init();
    void registerTypes();
    void loadFonts();
+    void loadTranslator();
+    void updateTranslator(const QLocale &locale);
    bool parseCommands();

-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-    void startLocalServer();
-#endif
-
    QQmlApplicationEngine *qmlEngine() const;
-    QNetworkAccessManager *networkManager();
-    QClipboard *getClipboard();
+    QNetworkAccessManager *manager() { return m_nam; }
+
+signals:
+    void translationsUpdated();

 private:
+    void initModels();
+    void initControllers();
+
    QQmlApplicationEngine *m_engine {};
    std::shared_ptr<Settings> m_settings;

-    QScopedPointer<CoreController> m_coreController;
-
    QSharedPointer<ContainerProps> m_containerProps;
    QSharedPointer<ProtocolProps> m_protocolProps;

+    QSharedPointer<QTranslator> m_translator;
    QCommandLineParser m_parser;

+    QSharedPointer<ContainersModel> m_containersModel;
+    QSharedPointer<ContainersModel> m_defaultServerContainersModel;
+    QSharedPointer<ServersModel> m_serversModel;
+    QSharedPointer<LanguageModel> m_languageModel;
+    QSharedPointer<ProtocolsModel> m_protocolsModel;
+    QSharedPointer<SitesModel> m_sitesModel;
+    QSharedPointer<AppSplitTunnelingModel> m_appSplitTunnelingModel;
+    QSharedPointer<ClientManagementModel> m_clientManagementModel;
+    QSharedPointer<ApiServicesModel> m_apiServicesModel;
+    QSharedPointer<ApiCountryModel> m_apiCountryModel;
+
+    QScopedPointer<OpenVpnConfigModel> m_openVpnConfigModel;
+    QScopedPointer<ShadowSocksConfigModel> m_shadowSocksConfigModel;
+    QScopedPointer<CloakConfigModel> m_cloakConfigModel;
+    QScopedPointer<XrayConfigModel> m_xrayConfigModel;    
+    QScopedPointer<WireGuardConfigModel> m_wireGuardConfigModel;
+    QScopedPointer<AwgConfigModel> m_awgConfigModel;
+#ifdef Q_OS_WINDOWS
+    QScopedPointer<Ikev2ConfigModel> m_ikev2ConfigModel;
+#endif
+
+    QScopedPointer<SftpConfigModel> m_sftpConfigModel;
+    QScopedPointer<Socks5ProxyConfigModel> m_socks5ConfigModel;
+
    QSharedPointer<VpnConnection> m_vpnConnection;
    QThread m_vpnConnectionThread;
+#ifndef Q_OS_ANDROID
+    QScopedPointer<NotificationHandler> m_notificationHandler;
+#endif
+
+    QScopedPointer<ConnectionController> m_connectionController;
+    QScopedPointer<PageController> m_pageController;
+    QScopedPointer<InstallController> m_installController;
+    QScopedPointer<ImportController> m_importController;
+    QScopedPointer<ExportController> m_exportController;
+    QScopedPointer<SettingsController> m_settingsController;
+    QScopedPointer<SitesController> m_sitesController;
+    QScopedPointer<SystemController> m_systemController;
+    QScopedPointer<AppSplitTunnelingController> m_appSplitTunnelingController;

    QNetworkAccessManager *m_nam;
+
+    QMetaObject::Connection m_reloadConfigErrorOccurredConnection;
 };

 #endif // AMNEZIA_APPLICATION_H
--- a/client/android/AndroidManifest.xml
+++ b/client/android/AndroidManifest.xml
@@ -20,7 +20,7 @@

    <uses-permission android:name="android.permission.INTERNET" />
    <!-- To request network state -->
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" android:maxSdkVersion="30" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -91,13 +91,6 @@
            android:exported="false"
            android:theme="@style/Translucent" />

-        <activity android:name=".TvFilePicker"
-            android:excludeFromRecents="true"
-            android:launchMode="singleTask"
-            android:taskAffinity=""
-            android:exported="false"
-            android:theme="@style/Translucent" />
-
        <activity
            android:name=".ImportConfigActivity"
            android:excludeFromRecents="true"
--- a/client/android/awg/src/main/kotlin/Awg.kt
+++ b/client/android/awg/src/main/kotlin/Awg.kt
@@ -1,21 +1,28 @@
 package org.amnezia.vpn.protocol.awg

 import org.amnezia.vpn.protocol.wireguard.Wireguard
-import org.amnezia.vpn.protocol.wireguard.WireguardConfig
+import org.amnezia.vpn.util.optStringOrNull
 import org.json.JSONObject

 class Awg : Wireguard() {

    override val ifName: String = "awg0"

-    override fun parseConfig(config: JSONObject): WireguardConfig {
+    override fun parseConfig(config: JSONObject): AwgConfig {
        val configData = config.getJSONObject("awg_config_data")
-        return WireguardConfig.build {
-            setUseProtocolExtension(true)
-            configExtensionParameters(configData)
+        return AwgConfig.build {
            configWireguard(config, configData)
            configSplitTunneling(config)
            configAppSplitTunneling(config)
+            configData.optStringOrNull("Jc")?.let { setJc(it.toInt()) }
+            configData.optStringOrNull("Jmin")?.let { setJmin(it.toInt()) }
+            configData.optStringOrNull("Jmax")?.let { setJmax(it.toInt()) }
+            configData.optStringOrNull("S1")?.let { setS1(it.toInt()) }
+            configData.optStringOrNull("S2")?.let { setS2(it.toInt()) }
+            configData.optStringOrNull("H1")?.let { setH1(it.toLong()) }
+            configData.optStringOrNull("H2")?.let { setH2(it.toLong()) }
+            configData.optStringOrNull("H3")?.let { setH3(it.toLong()) }
+            configData.optStringOrNull("H4")?.let { setH4(it.toLong()) }
        }
    }
 }
--- a/client/android/awg/src/main/kotlin/AwgConfig.kt
+++ b/client/android/awg/src/main/kotlin/AwgConfig.kt
@@ -0,0 +1,108 @@
+package org.amnezia.vpn.protocol.awg
+
+import org.amnezia.vpn.protocol.BadConfigException
+import org.amnezia.vpn.protocol.wireguard.WireguardConfig
+
+class AwgConfig private constructor(
+    wireguardConfigBuilder: WireguardConfig.Builder,
+    val jc: Int,
+    val jmin: Int,
+    val jmax: Int,
+    val s1: Int,
+    val s2: Int,
+    val h1: Long,
+    val h2: Long,
+    val h3: Long,
+    val h4: Long
+) : WireguardConfig(wireguardConfigBuilder) {
+
+    private constructor(builder: Builder) : this(
+        builder,
+        builder.jc,
+        builder.jmin,
+        builder.jmax,
+        builder.s1,
+        builder.s2,
+        builder.h1,
+        builder.h2,
+        builder.h3,
+        builder.h4
+    )
+
+    override fun appendDeviceLine(sb: StringBuilder) = with(sb) {
+        super.appendDeviceLine(this)
+        appendLine("jc=$jc")
+        appendLine("jmin=$jmin")
+        appendLine("jmax=$jmax")
+        appendLine("s1=$s1")
+        appendLine("s2=$s2")
+        appendLine("h1=$h1")
+        appendLine("h2=$h2")
+        appendLine("h3=$h3")
+        appendLine("h4=$h4")
+    }
+
+    class Builder : WireguardConfig.Builder() {
+
+        private var _jc: Int? = null
+        internal var jc: Int
+            get() = _jc ?: throw BadConfigException("AWG: parameter jc is undefined")
+            private set(value) { _jc = value }
+
+        private var _jmin: Int? = null
+        internal var jmin: Int
+            get() = _jmin ?: throw BadConfigException("AWG: parameter jmin is undefined")
+            private set(value) { _jmin = value }
+
+        private var _jmax: Int? = null
+        internal var jmax: Int
+            get() = _jmax ?: throw BadConfigException("AWG: parameter jmax is undefined")
+            private set(value) { _jmax = value }
+
+        private var _s1: Int? = null
+        internal var s1: Int
+            get() = _s1 ?: throw BadConfigException("AWG: parameter s1 is undefined")
+            private set(value) { _s1 = value }
+
+        private var _s2: Int? = null
+        internal var s2: Int
+            get() = _s2 ?: throw BadConfigException("AWG: parameter s2 is undefined")
+            private set(value) { _s2 = value }
+
+        private var _h1: Long? = null
+        internal var h1: Long
+            get() = _h1 ?: throw BadConfigException("AWG: parameter h1 is undefined")
+            private set(value) { _h1 = value }
+
+        private var _h2: Long? = null
+        internal var h2: Long
+            get() = _h2 ?: throw BadConfigException("AWG: parameter h2 is undefined")
+            private set(value) { _h2 = value }
+
+        private var _h3: Long? = null
+        internal var h3: Long
+            get() = _h3 ?: throw BadConfigException("AWG: parameter h3 is undefined")
+            private set(value) { _h3 = value }
+
+        private var _h4: Long? = null
+        internal var h4: Long
+            get() = _h4 ?: throw BadConfigException("AWG: parameter h4 is undefined")
+            private set(value) { _h4 = value }
+
+        fun setJc(jc: Int) = apply { this.jc = jc }
+        fun setJmin(jmin: Int) = apply { this.jmin = jmin }
+        fun setJmax(jmax: Int) = apply { this.jmax = jmax }
+        fun setS1(s1: Int) = apply { this.s1 = s1 }
+        fun setS2(s2: Int) = apply { this.s2 = s2 }
+        fun setH1(h1: Long) = apply { this.h1 = h1 }
+        fun setH2(h2: Long) = apply { this.h2 = h2 }
+        fun setH3(h3: Long) = apply { this.h3 = h3 }
+        fun setH4(h4: Long) = apply { this.h4 = h4 }
+
+        override fun build(): AwgConfig = configBuild().run { AwgConfig(this@Builder) }
+    }
+
+    companion object {
+        inline fun build(block: Builder.() -> Unit): AwgConfig = Builder().apply(block).build()
+    }
+}
--- a/client/android/cloak/src/main/kotlin/Cloak.kt
+++ b/client/android/cloak/src/main/kotlin/Cloak.kt
@@ -3,16 +3,10 @@ package org.amnezia.vpn.protocol.cloak
 import android.util.Base64
 import net.openvpn.ovpn3.ClientAPI_Config
 import org.amnezia.vpn.protocol.openvpn.OpenVpn
-import org.amnezia.vpn.util.LibraryLoader.loadSharedLibrary
 import org.json.JSONObject

 class Cloak : OpenVpn() {

-    override fun internalInit() {
-        super.internalInit()
-        if (!isInitialized) loadSharedLibrary(context, "ck-ovpn-plugin")
-    }
-
    override fun parseConfig(config: JSONObject): ClientAPI_Config {
        val openVpnConfig = ClientAPI_Config()

--- a/client/android/gradle.properties
+++ b/client/android/gradle.properties
@@ -33,7 +33,7 @@ android.library.defaults.buildfeatures.androidresources=false
 # For development copy and set local values for these parameters in local.properties
 #androidCompileSdkVersion=android-34
 #androidBuildToolsVersion=34.0.0
-#qtMinSdkVersion=26
+#qtMinSdkVersion=24
 #qtTargetSdkVersion=34
 #androidNdkVersion=26.1.10909125
 #qtTargetAbiList=x86_64
--- a/client/android/openvpn/src/main/kotlin/org/amnezia/vpn/protocol/openvpn/OpenVpn.kt
+++ b/client/android/openvpn/src/main/kotlin/org/amnezia/vpn/protocol/openvpn/OpenVpn.kt
@@ -11,7 +11,6 @@ import org.amnezia.vpn.protocol.Protocol
 import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
 import org.amnezia.vpn.protocol.Statistics
 import org.amnezia.vpn.protocol.VpnStartException
-import org.amnezia.vpn.util.LibraryLoader.loadSharedLibrary
 import org.amnezia.vpn.util.net.InetNetwork
 import org.amnezia.vpn.util.net.getLocalNetworks
 import org.amnezia.vpn.util.net.parseInetAddress
@@ -35,10 +34,7 @@ open class OpenVpn : Protocol() {
        }

    override fun internalInit() {
-        if (!isInitialized) {
-            loadSharedLibrary(context, "ovpn3")
-            loadSharedLibrary(context, "ovpnutil")
-        }
+        if (!isInitialized) loadSharedLibrary(context, "ovpn3")
        if (this::scope.isInitialized) {
            scope.cancel()
        }
--- a/client/android/protocolApi/src/main/kotlin/Exceptions.kt
+++ b/client/android/protocolApi/src/main/kotlin/Exceptions.kt
@@ -2,6 +2,7 @@ package org.amnezia.vpn.protocol

 sealed class ProtocolException(message: String? = null, cause: Throwable? = null) : Exception(message, cause)

+class LoadLibraryException(message: String? = null, cause: Throwable? = null) : ProtocolException(message, cause)
 class BadConfigException(message: String? = null, cause: Throwable? = null) : ProtocolException(message, cause)

 class VpnStartException(message: String? = null, cause: Throwable? = null) : ProtocolException(message, cause)
--- a/client/android/protocolApi/src/main/kotlin/Protocol.kt
+++ b/client/android/protocolApi/src/main/kotlin/Protocol.kt
@@ -1,5 +1,6 @@
 package org.amnezia.vpn.protocol

+import android.annotation.SuppressLint
 import android.content.Context
 import android.net.IpPrefix
 import android.net.VpnService
@@ -7,6 +8,9 @@ import android.net.VpnService.Builder
 import android.os.Build
 import android.system.OsConstants
 import androidx.annotation.RequiresApi
+import java.io.File
+import java.io.FileOutputStream
+import java.util.zip.ZipFile
 import kotlinx.coroutines.flow.MutableStateFlow
 import org.amnezia.vpn.util.Log
 import org.amnezia.vpn.util.net.InetNetwork
@@ -154,6 +158,60 @@ abstract class Protocol {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
            vpnBuilder.setMetered(false)
    }
+
+    companion object {
+        private fun extractLibrary(context: Context, libraryName: String, destination: File): Boolean {
+            Log.d(TAG, "Extracting library: $libraryName")
+            val apks = hashSetOf<String>()
+            context.applicationInfo.run {
+                sourceDir?.let { apks += it }
+                splitSourceDirs?.let { apks += it }
+            }
+            for (abi in Build.SUPPORTED_ABIS) {
+                for (apk in apks) {
+                    ZipFile(File(apk), ZipFile.OPEN_READ).use { zipFile ->
+                        val mappedName = System.mapLibraryName(libraryName)
+                        val libraryZipPath = listOf("lib", abi, mappedName).joinToString(File.separator)
+                        val zipEntry = zipFile.getEntry(libraryZipPath)
+                        zipEntry?.let {
+                            Log.d(TAG, "Extracting apk:/$libraryZipPath to ${destination.absolutePath}")
+                            FileOutputStream(destination).use { outStream ->
+                                zipFile.getInputStream(zipEntry).use { inStream ->
+                                    inStream.copyTo(outStream, 32 * 1024)
+                                    outStream.fd.sync()
+                                }
+                            }
+                        }
+                        return true
+                    }
+                }
+            }
+            return false
+        }
+
+        @SuppressLint("UnsafeDynamicallyLoadedCode")
+        fun loadSharedLibrary(context: Context, libraryName: String) {
+            Log.d(TAG, "Loading library: $libraryName")
+            try {
+                System.loadLibrary(libraryName)
+                return
+            } catch (_: UnsatisfiedLinkError) {
+                Log.d(TAG, "Failed to load library, try to extract it from apk")
+            }
+            var tempFile: File? = null
+            try {
+                tempFile = File.createTempFile("lib", ".so", context.codeCacheDir)
+                if (extractLibrary(context, libraryName, tempFile)) {
+                    System.load(tempFile.absolutePath)
+                    return
+                }
+            } catch (e: Exception) {
+                throw LoadLibraryException("Failed to load library apk: $libraryName", e)
+            } finally {
+                tempFile?.delete()
+            }
+        }
+    }
 }

 private fun VpnService.Builder.addAddress(addr: InetNetwork) = addAddress(addr.address, addr.mask)
--- a/client/android/res/mipmap-anydpi-v26/ic_banner.xml
+++ b/client/android/res/mipmap-anydpi-v26/ic_banner.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_banner_background"/>
+    <foreground android:drawable="@mipmap/ic_banner_foreground"/>
+</adaptive-icon>
--- a/client/android/res/mipmap-hdpi/ic_banner.png
+++ b/client/android/res/mipmap-hdpi/ic_banner.png
--- a/client/android/res/mipmap-mdpi/ic_banner.png
+++ b/client/android/res/mipmap-mdpi/ic_banner.png
--- a/client/android/res/mipmap-xhdpi/ic_banner_foreground.png
+++ b/client/android/res/mipmap-xhdpi/ic_banner_foreground.png
--- a/client/android/res/values-ru/strings.xml
+++ b/client/android/res/values-ru/strings.xml
@@ -23,6 +23,4 @@
    <string name="notificationSettingsDialogTitle">Настройки уведомлений</string>
    <string name="notificationSettingsDialogMessage">Для показа уведомлений необходимо включить уведомления в системных настройках</string>
    <string name="openNotificationSettings">Открыть настройки уведомлений</string>
-
-    <string name="tvNoFileBrowser">Пожалуйста, установите приложение для просмотра файлов</string>
 </resources>
--- a/client/android/res/values/ic_banner_background.xml
+++ b/client/android/res/values/ic_banner_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_banner_background">#1E1E1F</color>
+</resources>
--- a/client/android/res/values/libs.xml
+++ b/client/android/res/values/libs.xml
@@ -3,6 +3,7 @@
    <!-- DO NOT EDIT THIS: This file is populated automatically by the deployment tool. -->

    <array name="bundled_libs">
+        <!-- %%INSERT_EXTRA_LIBS%% -->
    </array>

    <array name="qt_libs">
--- a/client/android/res/values/strings.xml
+++ b/client/android/res/values/strings.xml
@@ -23,6 +23,4 @@
    <string name="notificationSettingsDialogTitle">Notification settings</string>
    <string name="notificationSettingsDialogMessage">To show notifications, you must enable notifications in the system settings</string>
    <string name="openNotificationSettings">Open notification settings</string>
-
-    <string name="tvNoFileBrowser">Please install a file management utility to browse files</string>
 </resources>
--- a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
+++ b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
@@ -4,7 +4,6 @@ import android.Manifest
 import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.app.NotificationManager
-import android.content.ActivityNotFoundException
 import android.content.BroadcastReceiver
 import android.content.ComponentName
 import android.content.Intent
@@ -13,7 +12,6 @@ import android.content.Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY
 import android.content.ServiceConnection
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
-import android.net.Uri
 import android.net.VpnService
 import android.os.Build
 import android.os.Bundle
@@ -22,13 +20,7 @@ import android.os.IBinder
 import android.os.Looper
 import android.os.Message
 import android.os.Messenger
-import android.os.ParcelFileDescriptor
-import android.os.SystemClock
-import android.provider.OpenableColumns
 import android.provider.Settings
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
 import android.view.WindowManager.LayoutParams
 import android.webkit.MimeTypeMap
 import android.widget.Toast
@@ -37,7 +29,6 @@ import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import java.io.IOException
 import kotlin.LazyThreadSafetyMode.NONE
-import kotlin.coroutines.CoroutineContext
 import kotlin.text.RegexOption.IGNORE_CASE
 import AppListProvider
 import kotlinx.coroutines.CompletableDeferred
@@ -52,7 +43,6 @@ import kotlinx.coroutines.withContext
 import org.amnezia.vpn.protocol.getStatistics
 import org.amnezia.vpn.protocol.getStatus
 import org.amnezia.vpn.qt.QtAndroidController
-import org.amnezia.vpn.util.LibraryLoader.loadSharedLibrary
 import org.amnezia.vpn.util.Log
 import org.amnezia.vpn.util.Prefs
 import org.json.JSONException
@@ -79,7 +69,6 @@ class AmneziaActivity : QtActivity() {
    private var isInBoundState = false
    private var notificationStateReceiver: BroadcastReceiver? = null
    private lateinit var vpnServiceMessenger: IpcMessenger
-    private var pfd: ParcelFileDescriptor? = null

    private val actionResultHandlers = mutableMapOf<Int, ActivityResultHandler>()
    private val permissionRequestHandlers = mutableMapOf<Int, PermissionRequestHandler>()
@@ -168,8 +157,7 @@ class AmneziaActivity : QtActivity() {
     */
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        Log.d(TAG, "Create Amnezia activity")
-        loadLibs()
+        Log.d(TAG, "Create Amnezia activity: $intent")
        window.apply {
            addFlags(LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
            statusBarColor = getColor(R.color.black)
@@ -191,17 +179,6 @@ class AmneziaActivity : QtActivity() {
        runBlocking { vpnProto = proto.await() }
    }

-    private fun loadLibs() {
-        listOf(
-            "rsapss",
-            "crypto_3",
-            "ssl_3",
-            "ssh"
-        ).forEach {
-            loadSharedLibrary(this.applicationContext, it)
-        }
-    }
-
    private fun registerBroadcastReceivers() {
        notificationStateReceiver = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
            registerBroadcastReceiver(
@@ -210,7 +187,7 @@ class AmneziaActivity : QtActivity() {
                    NotificationManager.ACTION_APP_BLOCK_STATE_CHANGED
                )
            ) {
-                Log.v(
+                Log.d(
                    TAG, "Notification state changed: ${it?.action}, blocked = " +
                        "${it?.getBooleanExtra(NotificationManager.EXTRA_BLOCKED_STATE, false)}"
                )
@@ -224,7 +201,7 @@ class AmneziaActivity : QtActivity() {

    override fun onNewIntent(intent: Intent?) {
        super.onNewIntent(intent)
-        Log.v(TAG, "onNewIntent: $intent")
+        Log.d(TAG, "onNewIntent: $intent")
        intent?.let(::processIntent)
    }

@@ -413,7 +390,7 @@ class AmneziaActivity : QtActivity() {
    @MainThread
    private fun startVpn(vpnConfig: String) {
        getVpnProto(vpnConfig)?.let { proto ->
-            Log.v(TAG, "Proto from config: $proto, current proto: $vpnProto")
+            Log.d(TAG, "Proto from config: $proto, current proto: $vpnProto")
            if (isServiceConnected) {
                if (proto.serviceClass == vpnProto?.serviceClass) {
                    vpnProto = proto
@@ -523,25 +500,21 @@ class AmneziaActivity : QtActivity() {
                type = "text/*"
                putExtra(Intent.EXTRA_TITLE, fileName)
            }.also {
-                try {
-                    startActivityForResult(it, CREATE_FILE_ACTION_CODE, ActivityResultHandler(
-                        onSuccess = {
-                            it?.data?.let { uri ->
-                                Log.v(TAG, "Save file to $uri")
-                                try {
-                                    contentResolver.openOutputStream(uri)?.use { os ->
-                                        os.bufferedWriter().use { it.write(data) }
-                                    }
-                                } catch (e: IOException) {
-                                    Log.e(TAG, "Failed to save file $uri: $e")
-                                    // todo: send error to Qt
+                startActivityForResult(it, CREATE_FILE_ACTION_CODE, ActivityResultHandler(
+                    onSuccess = {
+                        it?.data?.let { uri ->
+                            Log.d(TAG, "Save file to $uri")
+                            try {
+                                contentResolver.openOutputStream(uri)?.use { os ->
+                                    os.bufferedWriter().use { it.write(data) }
                                }
+                            } catch (e: IOException) {
+                                Log.e(TAG, "Failed to save file $uri: $e")
+                                // todo: send error to Qt
                            }
                        }
-                    ))
-                } catch (_: ActivityNotFoundException) {
-                    Toast.makeText(this@AmneziaActivity, "Unsupported", Toast.LENGTH_LONG).show()
-                }
+                    }
+                ))
            }
        }
    }
@@ -550,115 +523,46 @@ class AmneziaActivity : QtActivity() {
    fun openFile(filter: String?) {
        Log.v(TAG, "Open file with filter: $filter")
        mainScope.launch {
-            val intent = if (!isOnTv()) {
-                val mimeTypes = if (!filter.isNullOrEmpty()) {
-                    val extensionRegex = "\\*\\.([a-z0-9]+)".toRegex(IGNORE_CASE)
-                    val mime = MimeTypeMap.getSingleton()
-                    extensionRegex.findAll(filter).map {
-                        it.groups[1]?.value?.let { mime.getMimeTypeFromExtension(it) } ?: "*/*"
-                    }.toSet()
-                } else emptySet()
+            val mimeTypes = if (!filter.isNullOrEmpty()) {
+                val extensionRegex = "\\*\\.([a-z0-9]+)".toRegex(IGNORE_CASE)
+                val mime = MimeTypeMap.getSingleton()
+                extensionRegex.findAll(filter).map {
+                    it.groups[1]?.value?.let { mime.getMimeTypeFromExtension(it) } ?: "*/*"
+                }.toSet()
+            } else emptySet()

-                Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-                    addCategory(Intent.CATEGORY_OPENABLE)
-                    Log.v(TAG, "File mimyType filter: $mimeTypes")
-                    if ("*/*" in mimeTypes) {
-                        type = "*/*"
-                    } else {
-                        when (mimeTypes.size) {
-                            1 -> type = mimeTypes.first()
+            Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+                addCategory(Intent.CATEGORY_OPENABLE)
+                Log.v(TAG, "File mimyType filter: $mimeTypes")
+                if ("*/*" in mimeTypes) {
+                    type = "*/*"
+                } else {
+                    when (mimeTypes.size) {
+                        1 -> type = mimeTypes.first()

-                            in 2..Int.MAX_VALUE -> {
-                                type = "*/*"
-                                putExtra(EXTRA_MIME_TYPES, mimeTypes.toTypedArray())
-                            }
-
-                            else -> type = "*/*"
+                        in 2..Int.MAX_VALUE -> {
+                            type = "*/*"
+                            putExtra(EXTRA_MIME_TYPES, mimeTypes.toTypedArray())
                        }
+
+                        else -> type = "*/*"
                    }
                }
-            } else {
-                Intent(this@AmneziaActivity, TvFilePicker::class.java)
-            }
-
-            try {
-                startActivityForResult(intent, OPEN_FILE_ACTION_CODE, ActivityResultHandler(
+            }.also {
+                startActivityForResult(it, OPEN_FILE_ACTION_CODE, ActivityResultHandler(
                    onAny = {
-                        if (isOnTv() && it?.hasExtra("activityNotFound") == true) {
-                            showNoFileBrowserAlertDialog()
-                        }
-                        val uri = it?.data?.apply {
-                            grantUriPermission(packageName, this, Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                        }?.toString() ?: ""
-                        Log.v(TAG, "Open file: $uri")
+                        val uri = it?.data?.toString() ?: ""
+                        Log.d(TAG, "Open file: $uri")
                        mainScope.launch {
                            qtInitialized.await()
                            QtAndroidController.onFileOpened(uri)
                        }
                    }
                ))
-            } catch (_: ActivityNotFoundException) {
-                showNoFileBrowserAlertDialog()
-                mainScope.launch {
-                    qtInitialized.await()
-                    QtAndroidController.onFileOpened("")
-                }
            }
        }
    }

-    private fun showNoFileBrowserAlertDialog() {
-        AlertDialog.Builder(this)
-            .setMessage(R.string.tvNoFileBrowser)
-            .setCancelable(false)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
-                try {
-                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://webstoreredirect")))
-                } catch (_: Throwable) {}
-            }
-            .show()
-    }
-
-    @Suppress("unused")
-    fun getFd(fileName: String): Int {
-        Log.v(TAG, "Get fd for $fileName")
-        return blockingCall {
-            try {
-                pfd = contentResolver.openFileDescriptor(Uri.parse(fileName), "r")
-                pfd?.fd ?: -1
-            } catch (e: Exception) {
-                Log.e(TAG, "Failed to get fd: $e")
-                -1
-            }
-        }
-    }
-
-    @Suppress("unused")
-    fun closeFd() {
-        Log.v(TAG, "Close fd")
-        mainScope.launch {
-            pfd?.close()
-            pfd = null
-        }
-    }
-
-    @Suppress("unused")
-    fun getFileName(uri: String): String {
-        Log.v(TAG, "Get file name for uri: $uri")
-        return blockingCall {
-            try {
-                contentResolver.query(Uri.parse(uri), arrayOf(OpenableColumns.DISPLAY_NAME), null, null, null)?.use { cursor ->
-                    if (cursor.moveToFirst() && !cursor.isNull(0)) {
-                        return@blockingCall cursor.getString(0) ?: ""
-                    }
-                }
-            } catch (e: Exception) {
-                Log.e(TAG, "Failed to get file name: $e")
-            }
-            ""
-        }
-    }
-
    @Suppress("unused")
    @SuppressLint("UnsupportedChromeOsCameraSystemFeature")
    fun isCameraPresent(): Boolean = applicationContext.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)
@@ -803,121 +707,9 @@ class AmneziaActivity : QtActivity() {
        }
    }

-    // method to workaround Qt's problem with calling the keyboard on TVs
-    @Suppress("unused")
-    fun sendTouch(x: Float, y: Float) {
-        Log.v(TAG, "Send touch: $x, $y")
-        blockingCall {
-            findQtWindow(window.decorView)?.let {
-                Log.v(TAG, "Send touch to $it")
-                it.dispatchTouchEvent(createEvent(x, y, SystemClock.uptimeMillis(), MotionEvent.ACTION_DOWN))
-                it.dispatchTouchEvent(createEvent(x, y, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP))
-            }
-        }
-    }
-
-    private fun findQtWindow(view: View): View? {
-        Log.v(TAG, "findQtWindow: process $view")
-        if (view::class.simpleName == "QtWindow") return view
-        else if (view is ViewGroup) {
-            for (i in 0 until view.childCount) {
-                val result = findQtWindow(view.getChildAt(i))
-                if (result != null) return result
-            }
-            return null
-        } else return null
-    }
-
-    private fun createEvent(x: Float, y: Float, eventTime: Long, action: Int): MotionEvent =
-        MotionEvent.obtain(
-            eventTime,
-            eventTime,
-            action,
-            1,
-            arrayOf(MotionEvent.PointerProperties().apply {
-                id = 0
-                toolType = MotionEvent.TOOL_TYPE_FINGER
-            }),
-            arrayOf(MotionEvent.PointerCoords().apply {
-                this.x = x
-                this.y = y
-                pressure = 1f
-                size = 1f
-            }),
-            0, 0, 1.0f, 1.0f, 0, 0, 0,0
-        )
-
-    // workaround for a bug in Qt that causes the mouse click event not to be handled
-    // also disable right-click, as it causes the application to crash
-    private var lastButtonState = 0
-    private fun MotionEvent.fixCopy(): MotionEvent = MotionEvent.obtain(
-        downTime,
-        eventTime,
-        action,
-        pointerCount,
-        (0 until pointerCount).map { i ->
-            MotionEvent.PointerProperties().apply {
-                getPointerProperties(i, this)
-            }
-        }.toTypedArray(),
-        (0 until pointerCount).map { i ->
-            MotionEvent.PointerCoords().apply {
-                getPointerCoords(i, this)
-            }
-        }.toTypedArray(),
-        metaState,
-        MotionEvent.BUTTON_PRIMARY,
-        xPrecision,
-        yPrecision,
-        deviceId,
-        edgeFlags,
-        source,
-        flags
-    )
-
-    private fun handleMouseEvent(ev: MotionEvent, superDispatch: (MotionEvent?) -> Boolean): Boolean {
-        when (ev.action) {
-            MotionEvent.ACTION_DOWN -> {
-                lastButtonState = ev.buttonState
-                if (ev.buttonState == MotionEvent.BUTTON_SECONDARY) return true
-            }
-
-            MotionEvent.ACTION_UP -> {
-                when (lastButtonState) {
-                    MotionEvent.BUTTON_SECONDARY -> return true
-                    MotionEvent.BUTTON_PRIMARY -> {
-                        val modEvent = ev.fixCopy()
-                        return superDispatch(modEvent).apply { modEvent.recycle() }
-                    }
-                }
-            }
-        }
-        return superDispatch(ev)
-    }
-
-    override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
-        Log.v(TAG, "dispatchTouch: $ev")
-        if (ev != null && ev.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE) {
-            return handleMouseEvent(ev) { super.dispatchTouchEvent(it) }
-        }
-        return super.dispatchTouchEvent(ev)
-    }
-
-    override fun dispatchTrackballEvent(ev: MotionEvent?): Boolean {
-        ev?.let { return handleMouseEvent(ev) { super.dispatchTrackballEvent(it) }}
-        return super.dispatchTrackballEvent(ev)
-    }
-
    /**
     * Utils methods
     */
-    private fun <T> blockingCall(
-        context: CoroutineContext = Dispatchers.Main.immediate,
-        block: suspend () -> T
-    ) = runBlocking {
-        mainScope.async(context) { block() }.await()
-    }
-
    companion object {
        private fun actionCodeToString(actionCode: Int): String =
            when (actionCode) {
--- a/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt
+++ b/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt
@@ -22,7 +22,6 @@ import androidx.annotation.MainThread
 import androidx.core.app.ServiceCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
-import java.net.UnknownHostException
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.LazyThreadSafetyMode.NONE
 import kotlinx.coroutines.CoroutineExceptionHandler
@@ -41,6 +40,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 import org.amnezia.vpn.protocol.BadConfigException
+import org.amnezia.vpn.protocol.LoadLibraryException
 import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
 import org.amnezia.vpn.protocol.ProtocolState.CONNECTING
 import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
@@ -50,7 +50,6 @@ import org.amnezia.vpn.protocol.ProtocolState.UNKNOWN
 import org.amnezia.vpn.protocol.VpnException
 import org.amnezia.vpn.protocol.VpnStartException
 import org.amnezia.vpn.protocol.putStatus
-import org.amnezia.vpn.util.LoadLibraryException
 import org.amnezia.vpn.util.Log
 import org.amnezia.vpn.util.Prefs
 import org.amnezia.vpn.util.net.NetworkState
@@ -128,8 +127,6 @@ open class AmneziaVpnService : VpnService() {

            is LoadLibraryException -> onError("${e.message}. Caused: ${e.cause?.message}")

-            is UnknownHostException -> onError("Unknown host")
-
            else -> throw e
        }
    }
@@ -300,7 +297,7 @@ open class AmneziaVpnService : VpnService() {
            arrayOf(ACTION_CONNECT, ACTION_DISCONNECT), ContextCompat.RECEIVER_NOT_EXPORTED
        ) {
            it?.action?.let { action ->
-                Log.v(TAG, "Broadcast request received: $action")
+                Log.d(TAG, "Broadcast request received: $action")
                when (action) {
                    ACTION_CONNECT -> connect()
                    ACTION_DISCONNECT -> disconnect()
@@ -317,7 +314,7 @@ open class AmneziaVpnService : VpnService() {
                )
            ) {
                val state = it?.getBooleanExtra(NotificationManager.EXTRA_BLOCKED_STATE, false)
-                Log.v(TAG, "Notification state changed: ${it?.action}, blocked = $state")
+                Log.d(TAG, "Notification state changed: ${it?.action}, blocked = $state")
                if (state == false) {
                    enableNotification()
                } else {
@@ -450,7 +447,7 @@ open class AmneziaVpnService : VpnService() {
            serviceNotification.isNotificationEnabled() &&
            getSystemService<PowerManager>()?.isInteractive != false
        ) {
-            Log.v(TAG, "Launch traffic stats update")
+            Log.d(TAG, "Launch traffic stats update")
            trafficStats.reset()
            startTrafficStatsUpdateJob()
        }
--- a/client/android/src/org/amnezia/vpn/AuthActivity.kt
+++ b/client/android/src/org/amnezia/vpn/AuthActivity.kt
@@ -66,7 +66,7 @@ class AuthActivity : FragmentActivity() {
            object : BiometricPrompt.AuthenticationCallback() {
                override fun onAuthenticationSucceeded(result: AuthenticationResult) {
                    super.onAuthenticationSucceeded(result)
-                    Log.v(TAG, "Authentication succeeded")
+                    Log.d(TAG, "Authentication succeeded")
                    QtAndroidController.onAuthResult(true)
                    finish()
                }
--- a/client/android/src/org/amnezia/vpn/ImportConfigActivity.kt
+++ b/client/android/src/org/amnezia/vpn/ImportConfigActivity.kt
@@ -29,20 +29,20 @@ class ImportConfigActivity : ComponentActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        Log.v(TAG, "Create Import Config Activity: $intent")
+        Log.d(TAG, "Create Import Config Activity: $intent")
        intent?.let(::readConfig)
    }

    override fun onNewIntent(intent: Intent) {
        super.onNewIntent(intent)
-        Log.v(TAG, "onNewIntent: $intent")
+        Log.d(TAG, "onNewIntent: $intent")
        intent.let(::readConfig)
    }

    private fun readConfig(intent: Intent) {
        when (intent.action) {
            ACTION_SEND -> {
-                Log.v(TAG, "Process SEND action, type: ${intent.type}")
+                Log.d(TAG, "Process SEND action, type: ${intent.type}")
                when (intent.type) {
                    "application/octet-stream" -> {
                        intent.getUriCompat()?.let { uri ->
@@ -60,7 +60,7 @@ class ImportConfigActivity : ComponentActivity() {
            }

            ACTION_VIEW -> {
-                Log.v(TAG, "Process VIEW action, scheme: ${intent.scheme}")
+                Log.d(TAG, "Process VIEW action, scheme: ${intent.scheme}")
                when (intent.scheme) {
                    "file", "content" -> {
                        intent.data?.let { uri ->
--- a/client/android/src/org/amnezia/vpn/ServiceNotification.kt
+++ b/client/android/src/org/amnezia/vpn/ServiceNotification.kt
@@ -62,7 +62,7 @@ class ServiceNotification(private val context: Context) {
    fun buildNotification(serverName: String?, protocol: String?, state: ProtocolState): Notification {
        val speedString = if (state == CONNECTED) zeroSpeed else null

-        Log.v(TAG, "Build notification: $serverName, $state")
+        Log.d(TAG, "Build notification: $serverName, $state")

        return notificationBuilder
            .setSmallIcon(R.drawable.ic_amnezia_round)
@@ -88,15 +88,17 @@ class ServiceNotification(private val context: Context) {
    fun isNotificationEnabled(): Boolean {
        if (!context.isNotificationPermissionGranted()) return false
        if (!notificationManager.areNotificationsEnabled()) return false
-        return notificationManager.getNotificationChannel(NOTIFICATION_CHANNEL_ID)?.let {
-            it.importance != NotificationManager.IMPORTANCE_NONE
-        } ?: true
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            return notificationManager.getNotificationChannel(NOTIFICATION_CHANNEL_ID)
+                ?.let { it.importance != NotificationManager.IMPORTANCE_NONE } ?: true
+        }
+        return true
    }

    @SuppressLint("MissingPermission")
    fun updateNotification(serverName: String?, protocol: String?, state: ProtocolState) {
        if (context.isNotificationPermissionGranted()) {
-            Log.v(TAG, "Update notification: $serverName, $state")
+            Log.d(TAG, "Update notification: $serverName, $state")
            notificationManager.notify(NOTIFICATION_ID, buildNotification(serverName, protocol, state))
        }
    }
--- a/client/android/src/org/amnezia/vpn/TvFilePicker.kt
+++ b/client/android/src/org/amnezia/vpn/TvFilePicker.kt
@@ -1,45 +0,0 @@
-package org.amnezia.vpn
-
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.result.contract.ActivityResultContracts
-import org.amnezia.vpn.util.Log
-
-private const val TAG = "TvFilePicker"
-
-class TvFilePicker : ComponentActivity() {
-
-    private val fileChooseResultLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) {
-        setResult(RESULT_OK, Intent().apply { data = it })
-        finish()
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        Log.v(TAG, "onCreate")
-        getFile()
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        Log.v(TAG, "onNewIntent")
-        getFile()
-    }
-
-    private fun getFile() {
-        try {
-            Log.v(TAG, "getFile")
-            fileChooseResultLauncher.launch("*/*")
-        } catch (_: ActivityNotFoundException) {
-            Log.w(TAG, "Activity not found")
-            setResult(RESULT_CANCELED, Intent().apply { putExtra("activityNotFound", true) })
-            finish()
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to get file: $e")
-            setResult(RESULT_CANCELED)
-            finish()
-        }
-    }
-}
--- a/client/android/utils/src/main/kotlin/LibraryLoader.kt
+++ b/client/android/utils/src/main/kotlin/LibraryLoader.kt
@@ -1,66 +0,0 @@
-package org.amnezia.vpn.util
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.os.Build
-import java.io.File
-import java.io.FileOutputStream
-import java.util.zip.ZipFile
-
-private const val TAG = "LibraryLoader"
-
-object LibraryLoader {
-    private fun extractLibrary(context: Context, libraryName: String, destination: File): Boolean {
-        Log.d(TAG, "Extracting library: $libraryName")
-        val apks = hashSetOf<String>()
-        context.applicationInfo.run {
-            sourceDir?.let { apks += it }
-            splitSourceDirs?.let { apks += it }
-        }
-        for (abi in Build.SUPPORTED_ABIS) {
-            for (apk in apks) {
-                ZipFile(File(apk), ZipFile.OPEN_READ).use { zipFile ->
-                    val mappedName = System.mapLibraryName(libraryName)
-                    val libraryZipPath = listOf("lib", abi, mappedName).joinToString(File.separator)
-                    val zipEntry = zipFile.getEntry(libraryZipPath)
-                    zipEntry?.let {
-                        Log.d(TAG, "Extracting apk:/$libraryZipPath to ${destination.absolutePath}")
-                        FileOutputStream(destination).use { outStream ->
-                            zipFile.getInputStream(zipEntry).use { inStream ->
-                                inStream.copyTo(outStream, 32 * 1024)
-                                outStream.fd.sync()
-                            }
-                        }
-                    }
-                    return true
-                }
-            }
-        }
-        return false
-    }
-
-    @SuppressLint("UnsafeDynamicallyLoadedCode")
-    fun loadSharedLibrary(context: Context, libraryName: String) {
-        Log.d(TAG, "Loading library: $libraryName")
-        try {
-            System.loadLibrary(libraryName)
-            return
-        } catch (_: UnsatisfiedLinkError) {
-            Log.w(TAG, "Failed to load library, try to extract it from apk")
-        }
-        var tempFile: File? = null
-        try {
-            tempFile = File.createTempFile("lib", ".so", context.codeCacheDir)
-            if (extractLibrary(context, libraryName, tempFile)) {
-                System.load(tempFile.absolutePath)
-                return
-            }
-        } catch (e: Exception) {
-            throw LoadLibraryException("Failed to load library apk: $libraryName", e)
-        } finally {
-            tempFile?.delete()
-        }
-    }
-}
-
-class LoadLibraryException(message: String? = null, cause: Throwable? = null) : Exception(message, cause)
--- a/client/android/utils/src/main/kotlin/Log.kt
+++ b/client/android/utils/src/main/kotlin/Log.kt
@@ -1,6 +1,8 @@
 package org.amnezia.vpn.util

 import android.content.Context
+import android.icu.text.DateFormat
+import android.icu.text.SimpleDateFormat
 import android.os.Build
 import android.os.Process
 import java.io.File
@@ -10,6 +12,8 @@ import java.nio.channels.FileChannel
 import java.nio.channels.FileLock
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
+import java.util.Date
+import java.util.Locale
 import java.util.concurrent.locks.ReentrantLock
 import org.amnezia.vpn.util.Log.Priority.D
 import org.amnezia.vpn.util.Log.Priority.E
@@ -37,7 +41,11 @@ private const val LOG_MAX_FILE_SIZE = 1024 * 1024
 * |                   |              | create a report and/or terminate the process |
 */
 object Log {
-    private val dateTimeFormat: DateTimeFormatter = DateTimeFormatter.ofPattern(DATE_TIME_PATTERN)
+    private val dateTimeFormat: Any =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) DateTimeFormatter.ofPattern(DATE_TIME_PATTERN)
+        else object : ThreadLocal<DateFormat>() {
+            override fun initialValue(): DateFormat = SimpleDateFormat(DATE_TIME_PATTERN, Locale.US)
+        }

    private lateinit var logDir: File
    private val logFile: File by lazy { File(logDir, LOG_FILE_NAME) }
@@ -135,7 +143,12 @@ object Log {
    }

    private fun formatLogMsg(tag: String, msg: String, priority: Priority): String {
-        val date = LocalDateTime.now().format(dateTimeFormat)
+        val date = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            LocalDateTime.now().format(dateTimeFormat as DateTimeFormatter)
+        } else {
+            @Suppress("UNCHECKED_CAST")
+            (dateTimeFormat as ThreadLocal<DateFormat>).get()?.format(Date())
+        }
        return "$date ${Process.myPid()} ${Process.myTid()} $priority [${Thread.currentThread().name}] " +
            "$tag: $msg\n"
    }
--- a/client/android/utils/src/main/kotlin/net/NetworkState.kt
+++ b/client/android/utils/src/main/kotlin/net/NetworkState.kt
@@ -42,12 +42,18 @@ class NetworkState(
    private val networkCallback: NetworkCallback by lazy(NONE) {
        object : NetworkCallback() {
            override fun onAvailable(network: Network) {
-                Log.v(TAG, "onAvailable: $network")
+                Log.d(TAG, "onAvailable: $network")
            }

            override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-                Log.v(TAG, "onCapabilitiesChanged: $network, $networkCapabilities")
-                checkNetworkState(network, networkCapabilities)
+                Log.d(TAG, "onCapabilitiesChanged: $network, $networkCapabilities")
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    checkNetworkState(network, networkCapabilities)
+                } else {
+                    handler.post {
+                        checkNetworkState(network, networkCapabilities)
+                    }
+                }
            }

            private fun checkNetworkState(network: Network, networkCapabilities: NetworkCapabilities) {
@@ -67,11 +73,11 @@ class NetworkState(
            }

            override fun onBlockedStatusChanged(network: Network, blocked: Boolean) {
-                Log.v(TAG, "onBlockedStatusChanged: $network, $blocked")
+                Log.d(TAG, "onBlockedStatusChanged: $network, $blocked")
            }

            override fun onLost(network: Network) {
-                Log.v(TAG, "onLost: $network")
+                Log.d(TAG, "onLost: $network")
            }
        }
    }
@@ -81,7 +87,7 @@ class NetworkState(
        Log.d(TAG, "Bind network listener")
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
            connectivityManager.registerBestMatchingNetworkCallback(networkRequest, networkCallback, handler)
-        } else {
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            val numberAttempts = 300
            var attemptCount = 0
            while(true) {
@@ -102,6 +108,8 @@ class NetworkState(
                    }
                }
            }
+        } else {
+            connectivityManager.requestNetwork(networkRequest, networkCallback)
        }
        isListenerBound = true
    }
--- a/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt
+++ b/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/Wireguard.kt
@@ -1,19 +1,18 @@
 package org.amnezia.vpn.protocol.wireguard

 import android.net.VpnService.Builder
-import kotlinx.coroutines.CoroutineScope
+import java.io.IOException
+import java.util.Locale
+import java.util.TreeMap
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.amnezia.awg.GoBackend
 import org.amnezia.vpn.protocol.Protocol
 import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
 import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
 import org.amnezia.vpn.protocol.Statistics
 import org.amnezia.vpn.protocol.VpnStartException
-import org.amnezia.vpn.util.LibraryLoader.loadSharedLibrary
 import org.amnezia.vpn.util.Log
 import org.amnezia.vpn.util.asSequence
 import org.amnezia.vpn.util.net.InetEndpoint
@@ -28,8 +27,6 @@ open class Wireguard : Protocol() {

    private var tunnelHandle: Int = -1
    protected open val ifName: String = "amn0"
-    private lateinit var scope: CoroutineScope
-    private var statusJob: Job? = null

    override val statistics: Statistics
        get() {
@@ -52,17 +49,46 @@ open class Wireguard : Protocol() {

    override fun internalInit() {
        if (!isInitialized) loadSharedLibrary(context, "wg-go")
-        if (this::scope.isInitialized) {
-            scope.cancel()
-        }
-        scope = CoroutineScope(Dispatchers.IO)
    }

    override suspend fun startVpn(config: JSONObject, vpnBuilder: Builder, protect: (Int) -> Boolean) {
        val wireguardConfig = parseConfig(config)
+        val startTime = System.currentTimeMillis()
        start(wireguardConfig, vpnBuilder, protect)
+        waitForConnection(startTime)
+        state.value = CONNECTED
    }

+    private suspend fun waitForConnection(startTime: Long) {
+        Log.d(TAG, "Waiting for connection")
+        withContext(Dispatchers.IO) {
+            val time = String.format(Locale.ROOT,"%.3f", startTime / 1000.0)
+            try {
+                delay(1000)
+                var log = getLogcat(time)
+                Log.d(TAG, "First waiting log: $log")
+                // check that there is a connection log,
+                // to avoid infinite connection
+                if (!log.contains("Attaching to interface")) {
+                    Log.w(TAG, "Logs do not contain a connection log")
+                    return@withContext
+                }
+                while (!log.contains("Received handshake response")) {
+                    delay(1000)
+                    log = getLogcat(time)
+                }
+            } catch (e: IOException) {
+                Log.e(TAG, "Failed to get logcat: $e")
+            }
+        }
+    }
+
+    private fun getLogcat(time: String): String =
+        ProcessBuilder("logcat", "--buffer=main", "--format=raw", "*:S AmneziaWG/awg0", "-t", time)
+            .redirectErrorStream(true)
+            .start()
+            .inputStream.reader().readText()
+
    protected open fun parseConfig(config: JSONObject): WireguardConfig {
        val configData = config.getJSONObject("wireguard_config_data")
        return WireguardConfig.build {
@@ -103,40 +129,12 @@ open class Wireguard : Protocol() {
        val port = configData.getInt("port")
        setEndpoint(InetEndpoint(host, port))

-        if (configData.optBoolean("isObfuscationEnabled")) {
-            setUseProtocolExtension(true)
-            configExtensionParameters(configData)
-        }
-
        configData.optStringOrNull("persistent_keep_alive")?.let { setPersistentKeepalive(it.toInt()) }
        configData.getString("client_priv_key").let { setPrivateKeyHex(it.base64ToHex()) }
        configData.getString("server_pub_key").let { setPublicKeyHex(it.base64ToHex()) }
        configData.optStringOrNull("psk_key")?.let { setPreSharedKeyHex(it.base64ToHex()) }
    }

-    protected fun WireguardConfig.Builder.configExtensionParameters(configData: JSONObject) {
-        configData.optStringOrNull("Jc")?.let { setJc(it.toInt()) }
-        configData.optStringOrNull("Jmin")?.let { setJmin(it.toInt()) }
-        configData.optStringOrNull("Jmax")?.let { setJmax(it.toInt()) }
-        configData.optStringOrNull("S1")?.let { setS1(it.toInt()) }
-        configData.optStringOrNull("S2")?.let { setS2(it.toInt()) }
-        configData.optStringOrNull("S3")?.let { setS3(it.toInt()) }
-        configData.optStringOrNull("S4")?.let { setS4(it.toInt()) }
-        configData.optStringOrNull("H1")?.let { setH1(it.toLong()) }
-        configData.optStringOrNull("H2")?.let { setH2(it.toLong()) }
-        configData.optStringOrNull("H3")?.let { setH3(it.toLong()) }
-        configData.optStringOrNull("H4")?.let { setH4(it.toLong()) }
-        configData.optStringOrNull("I1")?.let { setI1(it) }
-        configData.optStringOrNull("I2")?.let { setI2(it) }
-        configData.optStringOrNull("I3")?.let { setI3(it) }
-        configData.optStringOrNull("I4")?.let { setI4(it) }
-        configData.optStringOrNull("I5")?.let { setI5(it) }
-        configData.optStringOrNull("J1")?.let { setJ1(it) }
-        configData.optStringOrNull("J2")?.let { setJ2(it) }
-        configData.optStringOrNull("J3")?.let { setJ3(it) }
-        configData.optStringOrNull("Itime")?.let { setItime(it.toInt()) }
-    }
-
    private fun start(config: WireguardConfig, vpnBuilder: Builder, protect: (Int) -> Boolean) {
        if (tunnelHandle != -1) {
            Log.w(TAG, "Tunnel already up")
@@ -163,43 +161,6 @@ open class Wireguard : Protocol() {
            tunnelHandle = -1
            throw VpnStartException("Protect VPN interface: permission not granted or revoked")
        }
-        launchStatusJob()
-    }
-
-    private fun launchStatusJob() {
-        Log.d(TAG, "Launch status job")
-        statusJob = scope.launch {
-            while (true) {
-                val lastHandshake = getLastHandshake()
-                Log.v(TAG, "lastHandshake=$lastHandshake")
-                if (lastHandshake == 0L) {
-                    delay(1000)
-                    continue
-                }
-                if (lastHandshake == -2L || lastHandshake > 0L) state.value = CONNECTED
-                else if (lastHandshake == -1L) state.value = DISCONNECTED
-                statusJob = null
-                break
-            }
-        }
-    }
-
-    private fun getLastHandshake(): Long {
-        if (tunnelHandle == -1) {
-            Log.e(TAG, "Trying to get config of a non-existent tunnel")
-            return -1
-        }
-        val config = GoBackend.awgGetConfig(tunnelHandle)
-        if (config == null) {
-            Log.e(TAG, "Failed to get tunnel config")
-            return -2
-        }
-        val lastHandshake = config.lines().find { it.startsWith("last_handshake_time_sec=") }?.substring(24)?.toLong()
-        if (lastHandshake == null) {
-            Log.e(TAG, "Failed to get last_handshake_time_sec")
-            return -2
-        }
-        return lastHandshake
    }

    override fun stopVpn() {
@@ -207,8 +168,6 @@ open class Wireguard : Protocol() {
            Log.w(TAG, "Tunnel already down")
            return
        }
-        statusJob?.cancel()
-        statusJob = null
        val handleToClose = tunnelHandle
        tunnelHandle = -1
        GoBackend.awgTurnOff(handleToClose)
--- a/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/WireguardConfig.kt
+++ b/client/android/wireguard/src/main/kotlin/org/amnezia/vpn/protocol/wireguard/WireguardConfig.kt
@@ -1,7 +1,6 @@
 package org.amnezia.vpn.protocol.wireguard

 import android.util.Base64
-import org.amnezia.vpn.protocol.BadConfigException
 import org.amnezia.vpn.protocol.ProtocolConfig
 import org.amnezia.vpn.util.net.InetEndpoint

@@ -13,28 +12,7 @@ open class WireguardConfig protected constructor(
    val persistentKeepalive: Int,
    val publicKeyHex: String,
    val preSharedKeyHex: String?,
-    val privateKeyHex: String,
-    val useProtocolExtension: Boolean,
-    val jc: Int?,
-    val jmin: Int?,
-    val jmax: Int?,
-    val s1: Int?,
-    val s2: Int?,
-    val s3: Int?,
-    val s4: Int?,
-    val h1: Long?,
-    val h2: Long?,
-    val h3: Long?,
-    val h4: Long?,
-    var i1: String?,
-    var i2: String?,
-    var i3: String?,
-    var i4: String?,
-    var i5: String?,
-    var j1: String?,
-    var j2: String?,
-    var j3: String?,
-    var itime: Int?
+    val privateKeyHex: String
 ) : ProtocolConfig(protocolConfigBuilder) {

    protected constructor(builder: Builder) : this(
@@ -43,28 +21,7 @@ open class WireguardConfig protected constructor(
        builder.persistentKeepalive,
        builder.publicKeyHex,
        builder.preSharedKeyHex,
-        builder.privateKeyHex,
-        builder.useProtocolExtension,
-        builder.jc,
-        builder.jmin,
-        builder.jmax,
-        builder.s1,
-        builder.s2,
-        builder.s3,
-        builder.s4,
-        builder.h1,
-        builder.h2,
-        builder.h3,
-        builder.h4,
-        builder.i1,
-        builder.i2,
-        builder.i3,
-        builder.i4,
-        builder.i5,
-        builder.j1,
-        builder.j2,
-        builder.j3,
-        builder.itime
+        builder.privateKeyHex
    )

    fun toWgUserspaceString(): String = with(StringBuilder()) {
@@ -76,41 +33,6 @@ open class WireguardConfig protected constructor(

    open fun appendDeviceLine(sb: StringBuilder) = with(sb) {
        appendLine("private_key=$privateKeyHex")
-        if (useProtocolExtension) {
-            validateProtocolExtensionParameters()
-            appendLine("jc=$jc")
-            appendLine("jmin=$jmin")
-            appendLine("jmax=$jmax")
-            appendLine("s1=$s1")
-            appendLine("s2=$s2")
-            s3?.let { appendLine("s3=$it") }
-            s4?.let { appendLine("s4=$it") }
-            appendLine("h1=$h1")
-            appendLine("h2=$h2")
-            appendLine("h3=$h3")
-            appendLine("h4=$h4")
-            i1?.let { appendLine("i1=$it") }
-            i2?.let { appendLine("i2=$it") }
-            i3?.let { appendLine("i3=$it") }
-            i4?.let { appendLine("i4=$it") }
-            i5?.let { appendLine("i5=$it") }
-            j1?.let { appendLine("j1=$it") }
-            j2?.let { appendLine("j2=$it") }
-            j3?.let { appendLine("j3=$it") }
-            itime?.let { appendLine("itime=$it") }
-        }
-    }
-
-    private fun validateProtocolExtensionParameters() {
-        if (jc == null) throw BadConfigException("Parameter jc is undefined")
-        if (jmin == null) throw BadConfigException("Parameter jmin is undefined")
-        if (jmax == null) throw BadConfigException("Parameter jmax is undefined")
-        if (s1 == null) throw BadConfigException("Parameter s1 is undefined")
-        if (s2 == null) throw BadConfigException("Parameter s2 is undefined")
-        if (h1 == null) throw BadConfigException("Parameter h1 is undefined")
-        if (h2 == null) throw BadConfigException("Parameter h2 is undefined")
-        if (h3 == null) throw BadConfigException("Parameter h3 is undefined")
-        if (h4 == null) throw BadConfigException("Parameter h4 is undefined")
    }

    open fun appendPeerLine(sb: StringBuilder) = with(sb) {
@@ -143,29 +65,6 @@ open class WireguardConfig protected constructor(

        override var mtu: Int = WIREGUARD_DEFAULT_MTU

-        internal var useProtocolExtension: Boolean = false
-
-        internal var jc: Int? = null
-        internal var jmin: Int? = null
-        internal var jmax: Int? = null
-        internal var s1: Int? = null
-        internal var s2: Int? = null
-        internal var s3: Int? = null
-        internal var s4: Int? = null
-        internal var h1: Long? = null
-        internal var h2: Long? = null
-        internal var h3: Long? = null
-        internal var h4: Long? = null
-        internal var i1: String? = null
-        internal var i2: String? = null
-        internal var i3: String? = null
-        internal var i4: String? = null
-        internal var i5: String? = null
-        internal var j1: String? = null
-        internal var j2: String? = null
-        internal var j3: String? = null
-        internal var itime: Int? = null
-
        fun setEndpoint(endpoint: InetEndpoint) = apply { this.endpoint = endpoint }

        fun setPersistentKeepalive(persistentKeepalive: Int) = apply { this.persistentKeepalive = persistentKeepalive }
@@ -176,29 +75,6 @@ open class WireguardConfig protected constructor(

        fun setPrivateKeyHex(privateKeyHex: String) = apply { this.privateKeyHex = privateKeyHex }

-        fun setUseProtocolExtension(useProtocolExtension: Boolean) = apply { this.useProtocolExtension = useProtocolExtension }
-
-        fun setJc(jc: Int) = apply { this.jc = jc }
-        fun setJmin(jmin: Int) = apply { this.jmin = jmin }
-        fun setJmax(jmax: Int) = apply { this.jmax = jmax }
-        fun setS1(s1: Int) = apply { this.s1 = s1 }
-        fun setS2(s2: Int) = apply { this.s2 = s2 }
-        fun setS3(s3: Int) = apply { this.s3 = s3 }
-        fun setS4(s4: Int) = apply { this.s4 = s4 }
-        fun setH1(h1: Long) = apply { this.h1 = h1 }
-        fun setH2(h2: Long) = apply { this.h2 = h2 }
-        fun setH3(h3: Long) = apply { this.h3 = h3 }
-        fun setH4(h4: Long) = apply { this.h4 = h4 }
-        fun setI1(i1: String) = apply { this.i1 = i1 }
-        fun setI2(i2: String) = apply { this.i2 = i2 }
-        fun setI3(i3: String) = apply { this.i3 = i3 }
-        fun setI4(i4: String) = apply { this.i4 = i4 }
-        fun setI5(i5: String) = apply { this.i5 = i5 }
-        fun setJ1(j1: String) = apply { this.j1 = j1 }
-        fun setJ2(j2: String) = apply { this.j2 = j2 }
-        fun setJ3(j3: String) = apply { this.j3 = j3 }
-        fun setItime(itime: Int) = apply { this.itime = itime }
-
        override fun build(): WireguardConfig = configBuild().run { WireguardConfig(this@Builder) }
    }

--- a/client/android/xray/src/main/kotlin/Xray.kt
+++ b/client/android/xray/src/main/kotlin/Xray.kt
@@ -130,8 +130,8 @@ class Xray : Protocol() {
            LibXray.initXray(assetsPath)
            val geoDir = File(assetsPath, "geo").absolutePath
            val configPath = File(context.cacheDir, "config.json")
-            Log.v(TAG, "xray.location.asset: $geoDir")
-            Log.v(TAG, "config: $configPath")
+            Log.d(TAG, "xray.location.asset: $geoDir")
+            Log.d(TAG, "config: $configPath")
            try {
                configPath.writeText(configJson)
            } catch (e: IOException) {
--- a/client/cmake/3rdparty.cmake
+++ b/client/cmake/3rdparty.cmake
@@ -2,6 +2,10 @@ set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/..)

 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/Modules;${CMAKE_MODULE_PATH}")

+if(NOT IOS AND NOT ANDROID)
+   include(${CLIENT_ROOT_DIR}/3rd/SingleApplication/singleapplication.cmake)
+endif()
+
 add_subdirectory(${CLIENT_ROOT_DIR}/3rd/SortFilterProxyModel)
 set(LIBS ${LIBS} SortFilterProxyModel)
 include(${CLIENT_ROOT_DIR}/cmake/QSimpleCrypto.cmake)
--- a/client/cmake/android.cmake
+++ b/client/cmake/android.cmake
@@ -1,6 +1,6 @@
 message("Client android ${CMAKE_ANDROID_ARCH_ABI} build")

-set(APP_ANDROID_MIN_SDK 26)
+set(APP_ANDROID_MIN_SDK 24)
 set(ANDROID_PLATFORM "android-${APP_ANDROID_MIN_SDK}" CACHE STRING
    "The minimum API level supported by the application or library" FORCE)

--- a/client/cmake/ios.cmake
+++ b/client/cmake/ios.cmake
@@ -76,22 +76,12 @@ set_target_properties(${PROJECT} PROPERTIES
    XCODE_LINK_BUILD_PHASE_MODE KNOWN_LOCATION
    XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/Frameworks"
    XCODE_EMBED_APP_EXTENSIONS networkextension
+    XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution"
+    XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development"
+    XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual
+    XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "match AppStore org.amnezia.AmneziaVPN"
+    XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "match Development org.amnezia.AmneziaVPN"
 )
-
-if(DEFINED DEPLOY)
-    set_target_properties(${PROJECT} PROPERTIES
-        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Distribution"
-        XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY[variant=Debug] "Apple Development"
-        XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual
-        XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "distr ios.org.amnezia.AmneziaVPN"
-        XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER[variant=Debug] "dev ios.org.amnezia.AmneziaVPN"
-    )
-else()
-    set_target_properties(${PROJECT} PROPERTIES
-        XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic
-    )
-endif()
-
 set_target_properties(${PROJECT} PROPERTIES
    XCODE_ATTRIBUTE_SWIFT_VERSION "5.0"
    XCODE_ATTRIBUTE_CLANG_ENABLE_MODULES "YES"
@@ -136,9 +126,9 @@ add_subdirectory(ios/networkextension)
 add_dependencies(${PROJECT} networkextension)

 set_property(TARGET ${PROJECT} PROPERTY XCODE_EMBED_FRAMEWORKS
-    "${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/apple/OpenVPNAdapter-ios/OpenVPNAdapter.framework"
+    "${CMAKE_CURRENT_SOURCE_DIR}/3rd/OpenVPNAdapter/build/Release-iphoneos/OpenVPNAdapter.framework"
 )

-set(CMAKE_XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/apple/OpenVPNAdapter-ios/)
-target_link_libraries("networkextension" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/apple/OpenVPNAdapter-ios/OpenVPNAdapter.framework")
+set(CMAKE_XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/3rd/OpenVPNAdapter/build/Release-iphoneos)
+target_link_libraries("networkextension" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/3rd/OpenVPNAdapter/build/Release-iphoneos/OpenVPNAdapter.framework")

--- a/client/cmake/macos.cmake
+++ b/client/cmake/macos.cmake
@@ -18,11 +18,7 @@ set(LIBS ${LIBS}
    ${FW_NETWORK_EXTENSION}
 )

-set_target_properties(${PROJECT} PROPERTIES 
-    MACOSX_BUNDLE TRUE
-    MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH}"
-    MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION_TWEAK}"
-)
+set_target_properties(${PROJECT} PROPERTIES MACOSX_BUNDLE TRUE)
 set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE INTERNAL "" FORCE)
 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)

--- a/client/cmake/sources.cmake
+++ b/client/cmake/sources.cmake
@@ -1,235 +0,0 @@
-set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
-
-set(HEADERS ${HEADERS}
-    ${CLIENT_ROOT_DIR}/migrations.h
-    ${CLIENT_ROOT_DIR}/../ipc/ipc.h
-    ${CLIENT_ROOT_DIR}/amnezia_application.h
-    ${CLIENT_ROOT_DIR}/core/models/containers/containers_defs.h
-    ${CLIENT_ROOT_DIR}/core/defs.h
-    ${CLIENT_ROOT_DIR}/core/errorstrings.h
-    ${CLIENT_ROOT_DIR}/core/scripts_registry.h
-    ${CLIENT_ROOT_DIR}/core/server_defs.h
-    ${CLIENT_ROOT_DIR}/core/api/apiDefs.h
-    ${CLIENT_ROOT_DIR}/core/qrCodeUtils.h
-    ${CLIENT_ROOT_DIR}/core/controllers/coreController.h
-    ${CLIENT_ROOT_DIR}/core/controllers/api/gatewayController.h
-    ${CLIENT_ROOT_DIR}/core/controllers/api/apiConfigController.h
-    ${CLIENT_ROOT_DIR}/core/controllers/api/apiSettingsController.h
-    ${CLIENT_ROOT_DIR}/core/controllers/api/apiPremV1MigrationController.h
-    ${CLIENT_ROOT_DIR}/core/controllers/selfhosted/serverController.h
-    ${CLIENT_ROOT_DIR}/core/controllers/selfhosted/selfhostedConfigController.h
-    ${CLIENT_ROOT_DIR}/core/controllers/selfhosted/clientManagementController.h
-    ${CLIENT_ROOT_DIR}/core/controllers/configController.h
-    ${CLIENT_ROOT_DIR}/core/controllers/dnsController.h
-    ${CLIENT_ROOT_DIR}/core/controllers/splitTunnelingController.h
-    ${CLIENT_ROOT_DIR}/core/controllers/settingsController.h
-    ${CLIENT_ROOT_DIR}/core/controllers/connectionController.h
-    ${CLIENT_ROOT_DIR}/core/controllers/vpnConfigurationController.h
-    ${CLIENT_ROOT_DIR}/protocols/protocols_defs.h
-    ${CLIENT_ROOT_DIR}/protocols/qml_register_protocols.h
-    ${CLIENT_ROOT_DIR}/ui/pages.h
-    ${CLIENT_ROOT_DIR}/ui/qautostart.h
-    ${CLIENT_ROOT_DIR}/protocols/vpnprotocol.h
-    ${CMAKE_CURRENT_BINARY_DIR}/version.h
-    ${CLIENT_ROOT_DIR}/core/sshclient.h
-    ${CLIENT_ROOT_DIR}/core/networkUtilities.h
-    ${CLIENT_ROOT_DIR}/core/serialization/serialization.h
-    ${CLIENT_ROOT_DIR}/core/serialization/transfer.h
-    ${CLIENT_ROOT_DIR}/../common/logger/logger.h
-    ${CLIENT_ROOT_DIR}/utils/qmlUtils.h
-    ${CLIENT_ROOT_DIR}/core/api/apiUtils.h
-    ${CLIENT_ROOT_DIR}/core/utils/fileUtils.h
-)
-
-# Mozilla headres
-set(HEADERS ${HEADERS}
-    ${CLIENT_ROOT_DIR}/mozilla/models/server.h
-    ${CLIENT_ROOT_DIR}/mozilla/shared/ipaddress.h
-    ${CLIENT_ROOT_DIR}/mozilla/shared/leakdetector.h
-    ${CLIENT_ROOT_DIR}/mozilla/controllerimpl.h
-    ${CLIENT_ROOT_DIR}/mozilla/localsocketcontroller.h
-)
-
-if(NOT IOS)
-    set(HEADERS ${HEADERS}
-        ${CLIENT_ROOT_DIR}/platforms/ios/QRCodeReaderBase.h
-    )
-endif()
-
-if(NOT ANDROID)
-    set(HEADERS ${HEADERS}
-        ${CLIENT_ROOT_DIR}/ui/notificationhandler.h
-    )
-endif()
-
-set(SOURCES ${SOURCES}
-    ${CLIENT_ROOT_DIR}/migrations.cpp
-    ${CLIENT_ROOT_DIR}/amnezia_application.cpp
-    ${CLIENT_ROOT_DIR}/core/models/containers/containers_defs.cpp
-    ${CLIENT_ROOT_DIR}/core/errorstrings.cpp
-    ${CLIENT_ROOT_DIR}/core/scripts_registry.cpp
-    ${CLIENT_ROOT_DIR}/core/server_defs.cpp
-    ${CLIENT_ROOT_DIR}/core/qrCodeUtils.cpp
-    ${CLIENT_ROOT_DIR}/core/controllers/coreController.cpp
-    ${CLIENT_ROOT_DIR}/core/controllers/api/gatewayController.cpp
-    ${CLIENT_ROOT_DIR}/core/controllers/api/apiConfigController.cpp
-    ${CLIENT_ROOT_DIR}/core/controllers/api/apiSettingsController.cpp
-    ${CLIENT_ROOT_DIR}/core/controllers/api/apiPremV1MigrationController.cpp
-    ${CLIENT_ROOT_DIR}/core/controllers/selfhosted/serverController.cpp
-    ${CLIENT_ROOT_DIR}/core/controllers/selfhosted/selfhostedConfigController.cpp
-    ${CLIENT_ROOT_DIR}/core/controllers/selfhosted/clientManagementController.cpp
-    ${CLIENT_ROOT_DIR}/core/controllers/configController.cpp
-    ${CLIENT_ROOT_DIR}/core/controllers/dnsController.cpp
-    ${CLIENT_ROOT_DIR}/core/controllers/splitTunnelingController.cpp
-    ${CLIENT_ROOT_DIR}/core/controllers/settingsController.cpp
-    ${CLIENT_ROOT_DIR}/core/controllers/connectionController.cpp
-    ${CLIENT_ROOT_DIR}/core/controllers/vpnConfigurationController.cpp
-    ${CLIENT_ROOT_DIR}/protocols/protocols_defs.cpp
-    ${CLIENT_ROOT_DIR}/ui/qautostart.cpp
-    ${CLIENT_ROOT_DIR}/protocols/vpnprotocol.cpp
-    ${CLIENT_ROOT_DIR}/core/sshclient.cpp
-    ${CLIENT_ROOT_DIR}/core/networkUtilities.cpp
-    ${CLIENT_ROOT_DIR}/core/serialization/outbound.cpp
-    ${CLIENT_ROOT_DIR}/core/serialization/inbound.cpp
-    ${CLIENT_ROOT_DIR}/core/serialization/ss.cpp
-    ${CLIENT_ROOT_DIR}/core/serialization/ssd.cpp
-    ${CLIENT_ROOT_DIR}/core/serialization/vless.cpp
-    ${CLIENT_ROOT_DIR}/core/serialization/trojan.cpp
-    ${CLIENT_ROOT_DIR}/core/serialization/vmess.cpp
-    ${CLIENT_ROOT_DIR}/core/serialization/vmess_new.cpp
-    ${CLIENT_ROOT_DIR}/../common/logger/logger.cpp
-    ${CLIENT_ROOT_DIR}/utils/qmlUtils.cpp
-    ${CLIENT_ROOT_DIR}/core/api/apiUtils.cpp
-    ${CLIENT_ROOT_DIR}/core/utils/fileUtils.cpp
-)
-
-# Mozilla sources
-set(SOURCES ${SOURCES}
-    ${CLIENT_ROOT_DIR}/mozilla/models/server.cpp
-    ${CLIENT_ROOT_DIR}/mozilla/shared/ipaddress.cpp
-    ${CLIENT_ROOT_DIR}/mozilla/shared/leakdetector.cpp
-    ${CLIENT_ROOT_DIR}/mozilla/localsocketcontroller.cpp
-)
-
-if(NOT IOS)
-    set(SOURCES ${SOURCES}
-        ${CLIENT_ROOT_DIR}/platforms/ios/QRCodeReaderBase.cpp
-    )
-endif()
-
-if(NOT ANDROID)
-    set(SOURCES ${SOURCES}
-        ${CLIENT_ROOT_DIR}/ui/notificationhandler.cpp
-    )
-endif()
-
-file(GLOB COMMON_FILES_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/*.h)
-file(GLOB COMMON_FILES_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/*.cpp)
-
-file(GLOB_RECURSE PAGE_LOGIC_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/ui/pages_logic/*.h)
-file(GLOB_RECURSE PAGE_LOGIC_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/ui/pages_logic/*.cpp)
-
-file(GLOB CONFIGURATORS_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/configurators/*.h)
-file(GLOB CONFIGURATORS_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/configurators/*.cpp)
-
-file(GLOB UI_MODELS_H CONFIGURE_DEPENDS
-    ${CLIENT_ROOT_DIR}/ui/models/*.h
-    ${CLIENT_ROOT_DIR}/ui/models/protocols/*.h
-    ${CLIENT_ROOT_DIR}/ui/models/services/*.h
-    ${CLIENT_ROOT_DIR}/ui/models/api/*.h
-    ${CLIENT_ROOT_DIR}/ui/models/selfhosted/*.h
-)
-
-file(GLOB UI_MODELS_CPP CONFIGURE_DEPENDS
-    ${CLIENT_ROOT_DIR}/ui/models/*.cpp
-    ${CLIENT_ROOT_DIR}/ui/models/protocols/*.cpp
-    ${CLIENT_ROOT_DIR}/ui/models/services/*.cpp
-    ${CLIENT_ROOT_DIR}/ui/models/api/*.cpp
-    ${CLIENT_ROOT_DIR}/ui/models/selfhosted/*.cpp
-)
-
-file(GLOB UI_CONTROLLERS_H CONFIGURE_DEPENDS
-    ${CLIENT_ROOT_DIR}/ui/controllers/*.h
-    ${CLIENT_ROOT_DIR}/ui/controllers/api/*.h
-    ${CLIENT_ROOT_DIR}/ui/controllers/selfhosted/*.h
-)
-
-file(GLOB UI_CONTROLLERS_CPP CONFIGURE_DEPENDS
-    ${CLIENT_ROOT_DIR}/ui/controllers/*.cpp
-    ${CLIENT_ROOT_DIR}/ui/controllers/api/*.cpp
-    ${CLIENT_ROOT_DIR}/ui/controllers/selfhosted/*.cpp
-)
-
-file(GLOB CORE_MODELS_H CONFIGURE_DEPENDS
-    ${CLIENT_ROOT_DIR}/core/models/*.h
-    ${CLIENT_ROOT_DIR}/core/models/containers/*.h
-    ${CLIENT_ROOT_DIR}/core/models/protocols/*.h
-    ${CLIENT_ROOT_DIR}/core/models/servers/*.h
-)
-
-file(GLOB CORE_MODELS_CPP CONFIGURE_DEPENDS
-    ${CLIENT_ROOT_DIR}/core/models/*.cpp
-    ${CLIENT_ROOT_DIR}/core/models/containers/*.cpp
-    ${CLIENT_ROOT_DIR}/core/models/protocols/*.cpp
-    ${CLIENT_ROOT_DIR}/core/models/servers/*.cpp
-)
-
-set(HEADERS ${HEADERS}
-    ${COMMON_FILES_H}
-    ${PAGE_LOGIC_H}
-    ${CONFIGURATORS_H}
-    ${UI_MODELS_H}
-    ${UI_CONTROLLERS_H}
-    ${CORE_MODELS_H}
-)
-set(SOURCES ${SOURCES}
-    ${COMMON_FILES_CPP}
-    ${PAGE_LOGIC_CPP}
-    ${CONFIGURATORS_CPP}
-    ${UI_MODELS_CPP}
-    ${UI_CONTROLLERS_CPP}
-    ${CORE_MODELS_CPP}
-)
-
-if(WIN32)
-    set(HEADERS ${HEADERS}
-        ${CLIENT_ROOT_DIR}/protocols/ikev2_vpn_protocol_windows.h
-    )
-
-    set(SOURCES ${SOURCES}
-        ${CLIENT_ROOT_DIR}/protocols/ikev2_vpn_protocol_windows.cpp
-    )
-
-    set(RESOURCES ${RESOURCES}
-        ${CMAKE_CURRENT_BINARY_DIR}/amneziavpn.rc
-    )
-endif()
-
-if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
-    message("Client desktop build")
-    add_compile_definitions(AMNEZIA_DESKTOP)
-
-    set(HEADERS ${HEADERS}
-        ${CLIENT_ROOT_DIR}/core/ipcclient.h
-        ${CLIENT_ROOT_DIR}/core/privileged_process.h
-        ${CLIENT_ROOT_DIR}/ui/systemtray_notificationhandler.h
-        ${CLIENT_ROOT_DIR}/protocols/openvpnprotocol.h
-        ${CLIENT_ROOT_DIR}/protocols/openvpnovercloakprotocol.h
-        ${CLIENT_ROOT_DIR}/protocols/shadowsocksvpnprotocol.h
-        ${CLIENT_ROOT_DIR}/protocols/wireguardprotocol.h
-        ${CLIENT_ROOT_DIR}/protocols/xrayprotocol.h
-        ${CLIENT_ROOT_DIR}/protocols/awgprotocol.h
-    )
-
-    set(SOURCES ${SOURCES}
-        ${CLIENT_ROOT_DIR}/core/ipcclient.cpp
-        ${CLIENT_ROOT_DIR}/core/privileged_process.cpp
-        ${CLIENT_ROOT_DIR}/ui/systemtray_notificationhandler.cpp
-        ${CLIENT_ROOT_DIR}/protocols/openvpnprotocol.cpp
-        ${CLIENT_ROOT_DIR}/protocols/openvpnovercloakprotocol.cpp
-        ${CLIENT_ROOT_DIR}/protocols/shadowsocksvpnprotocol.cpp
-        ${CLIENT_ROOT_DIR}/protocols/wireguardprotocol.cpp
-        ${CLIENT_ROOT_DIR}/protocols/xrayprotocol.cpp
-        ${CLIENT_ROOT_DIR}/protocols/awgprotocol.cpp
-    )
-endif()
--- a/client/configurators/awg_configurator.cpp
+++ b/client/configurators/awg_configurator.cpp
@@ -1,29 +1,23 @@
 #include "awg_configurator.h"
-#include "protocols/protocols_defs.h"
+
+#include <QJsonDocument>
+#include <QJsonObject>

 AwgConfigurator::AwgConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
    : WireguardConfigurator(settings, serverController, true, parent)
 {
 }

-QSharedPointer<ProtocolConfig> AwgConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                          const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode)
+QString AwgConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
+                                      ErrorCode &errorCode)
 {
-    auto result = WireguardConfigurator::createConfig(credentials, container, protocolConfig, errorCode);
-    if (!result) {
-        return nullptr;
-    }
-    
-    auto awgConfig = qSharedPointerCast<AwgProtocolConfig>(result);
-    if (!awgConfig) {
-        errorCode = ErrorCode::InternalError;
-        return nullptr;
-    }
-    
-    QString config = awgConfig->clientProtocolConfig.nativeConfig;
+    QString config = WireguardConfigurator::createConfig(credentials, container, containerConfig, errorCode);
+
+    QJsonObject jsonConfig = QJsonDocument::fromJson(config.toUtf8()).object();
+    QString awgConfig = jsonConfig.value(config_key::config).toString();

    QMap<QString, QString> configMap;
-    auto configLines = config.split("\n");
+    auto configLines = awgConfig.split("\n");
    for (auto &line : configLines) {
        auto trimmedLine = line.trimmed();
        if (trimmedLine.startsWith("[") && trimmedLine.endsWith("]")) {
@@ -36,17 +30,17 @@ QSharedPointer<ProtocolConfig> AwgConfigurator::createConfig(const ServerCredent
        }
    }

-    awgConfig->clientProtocolConfig.awgData.junkPacketCount = configMap.value(config_key::junkPacketCount);
-    awgConfig->clientProtocolConfig.awgData.junkPacketMinSize = configMap.value(config_key::junkPacketMinSize);
-    awgConfig->clientProtocolConfig.awgData.junkPacketMaxSize = configMap.value(config_key::junkPacketMaxSize);
-    awgConfig->clientProtocolConfig.awgData.initPacketJunkSize = configMap.value(config_key::initPacketJunkSize);
-    awgConfig->clientProtocolConfig.awgData.responsePacketJunkSize = configMap.value(config_key::responsePacketJunkSize);
-    awgConfig->clientProtocolConfig.awgData.initPacketMagicHeader = configMap.value(config_key::initPacketMagicHeader);
-    awgConfig->clientProtocolConfig.awgData.responsePacketMagicHeader = configMap.value(config_key::responsePacketMagicHeader);
-    awgConfig->clientProtocolConfig.awgData.underloadPacketMagicHeader = configMap.value(config_key::underloadPacketMagicHeader);
-    awgConfig->clientProtocolConfig.awgData.transportPacketMagicHeader = configMap.value(config_key::transportPacketMagicHeader);
+    jsonConfig[config_key::junkPacketCount] = configMap.value(config_key::junkPacketCount);
+    jsonConfig[config_key::junkPacketMinSize] = configMap.value(config_key::junkPacketMinSize);
+    jsonConfig[config_key::junkPacketMaxSize] = configMap.value(config_key::junkPacketMaxSize);
+    jsonConfig[config_key::initPacketJunkSize] = configMap.value(config_key::initPacketJunkSize);
+    jsonConfig[config_key::responsePacketJunkSize] = configMap.value(config_key::responsePacketJunkSize);
+    jsonConfig[config_key::initPacketMagicHeader] = configMap.value(config_key::initPacketMagicHeader);
+    jsonConfig[config_key::responsePacketMagicHeader] = configMap.value(config_key::responsePacketMagicHeader);
+    jsonConfig[config_key::underloadPacketMagicHeader] = configMap.value(config_key::underloadPacketMagicHeader);
+    jsonConfig[config_key::transportPacketMagicHeader] = configMap.value(config_key::transportPacketMagicHeader);
+    jsonConfig[config_key::mtu] =
+            containerConfig.value(ProtocolProps::protoToString(Proto::Awg)).toObject().value(config_key::mtu).toString(protocols::awg::defaultMtu);

-    awgConfig->clientProtocolConfig.wireGuardData.mtu = awgConfig->serverProtocolConfig.mtu;
-
-    return awgConfig;
+    return QJsonDocument(jsonConfig).toJson();
 }
--- a/client/configurators/awg_configurator.h
+++ b/client/configurators/awg_configurator.h
@@ -11,8 +11,8 @@ class AwgConfigurator : public WireguardConfigurator
 public:
    AwgConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);

-    QSharedPointer<ProtocolConfig> createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode) override;
+    QString createConfig(const ServerCredentials &credentials, DockerContainer container,
+                         const QJsonObject &containerConfig, ErrorCode &errorCode);
 };

 #endif // AWGCONFIGURATOR_H
--- a/client/configurators/cloak_configurator.cpp
+++ b/client/configurators/cloak_configurator.cpp
@@ -4,47 +4,23 @@
 #include <QJsonDocument>
 #include <QJsonObject>

-#include "core/models/containers/containers_defs.h"
-#include "core/controllers/selfhosted/serverController.h"
-#include "core/models/protocols/cloakProtocolConfig.h"
-#include "protocols/protocols_defs.h"
+#include "containers/containers_defs.h"
+#include "core/controllers/serverController.h"

 CloakConfigurator::CloakConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
    : ConfiguratorBase(settings, serverController, parent)
 {
 }

-ConfiguratorBase::Vars CloakConfigurator::generateProtocolVars(const ServerCredentials &credentials, DockerContainer container,
-                                                               const QSharedPointer<ProtocolConfig> &protocolConfig) const
+QString CloakConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
+                                        ErrorCode &errorCode)
 {
-    Vars vars = generateCommonVars(credentials, container);
-
-    auto cloakConfig = qSharedPointerCast<CloakProtocolConfig>(protocolConfig);
-    if (!cloakConfig) {
-        return vars;
-    }
-
-    vars.append({{"$CLOAK_SERVER_PORT", cloakConfig->serverProtocolConfig.port}});
-    vars.append({{"$FAKE_WEB_SITE_ADDRESS", cloakConfig->serverProtocolConfig.site}});
-
-    return vars;
-}
-
-QSharedPointer<ProtocolConfig> CloakConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                            const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode)
-{
-    auto cloakConfig = qSharedPointerCast<CloakProtocolConfig>(protocolConfig);
-    if (!cloakConfig) {
-        errorCode = ErrorCode::InternalError;
-        return nullptr;
-    }
-
    QString cloakPublicKey =
            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::cloak::ckPublicKeyPath, errorCode);
    cloakPublicKey.replace("\n", "");

    if (errorCode != ErrorCode::NoError) {
-        return nullptr;
+        return "";
    }

    QString cloakBypassUid =
@@ -52,38 +28,24 @@ QSharedPointer<ProtocolConfig> CloakConfigurator::createConfig(const ServerCrede
    cloakBypassUid.replace("\n", "");

    if (errorCode != ErrorCode::NoError) {
-        return nullptr;
+        return "";
    }

-    cloakConfig->clientProtocolConfig.transport = "direct";
-    cloakConfig->clientProtocolConfig.proxyMethod = "openvpn";
-    cloakConfig->clientProtocolConfig.encryptionMethod = "aes-gcm";
-    cloakConfig->clientProtocolConfig.uid = cloakBypassUid;
-    cloakConfig->clientProtocolConfig.publicKey = cloakPublicKey;
-    cloakConfig->clientProtocolConfig.serverName = cloakConfig->serverProtocolConfig.site;
-    cloakConfig->clientProtocolConfig.numConn = 1;
-    cloakConfig->clientProtocolConfig.browserSig = "chrome";
-    cloakConfig->clientProtocolConfig.streamTimeout = 300;
-    cloakConfig->clientProtocolConfig.remoteHost = credentials.hostName;
-    cloakConfig->clientProtocolConfig.remotePort = cloakConfig->serverProtocolConfig.port;
-
    QJsonObject config;
-    config.insert("Transport", cloakConfig->clientProtocolConfig.transport);
-    config.insert("ProxyMethod", cloakConfig->clientProtocolConfig.proxyMethod);
-    config.insert("EncryptionMethod", cloakConfig->clientProtocolConfig.encryptionMethod);
-    config.insert("UID", cloakConfig->clientProtocolConfig.uid);
-    config.insert("PublicKey", cloakConfig->clientProtocolConfig.publicKey);
-    config.insert("ServerName", cloakConfig->clientProtocolConfig.serverName);
-    config.insert("NumConn", cloakConfig->clientProtocolConfig.numConn);
-    config.insert("BrowserSig", cloakConfig->clientProtocolConfig.browserSig);
-    config.insert("StreamTimeout", cloakConfig->clientProtocolConfig.streamTimeout);
-    config.insert("RemoteHost", cloakConfig->clientProtocolConfig.remoteHost);
-    config.insert("RemotePort", cloakConfig->clientProtocolConfig.remotePort);
+    config.insert("Transport", "direct");
+    config.insert("ProxyMethod", "openvpn");
+    config.insert("EncryptionMethod", "aes-gcm");
+    config.insert("UID", cloakBypassUid);
+    config.insert("PublicKey", cloakPublicKey);
+    config.insert("ServerName", "$FAKE_WEB_SITE_ADDRESS");
+    config.insert("NumConn", 1);
+    config.insert("BrowserSig", "chrome");
+    config.insert("StreamTimeout", 300);
+    config.insert("RemoteHost", credentials.hostName);
+    config.insert("RemotePort", "$CLOAK_SERVER_PORT");

-    QString textCfg = QJsonDocument(config).toJson();
+    QString textCfg = m_serverController->replaceVars(QJsonDocument(config).toJson(),
+                                                      m_serverController->genVarsForScript(credentials, container, containerConfig));

-    cloakConfig->clientProtocolConfig.isEmpty = false;
-    cloakConfig->clientProtocolConfig.nativeConfig = textCfg;
-
-    return cloakConfig;
+    return textCfg;
 }
--- a/client/configurators/cloak_configurator.h
+++ b/client/configurators/cloak_configurator.h
@@ -4,7 +4,6 @@
 #include <QObject>

 #include "configurator_base.h"
-#include "core/models/protocols/cloakProtocolConfig.h"

 using namespace amnezia;

@@ -14,11 +13,8 @@ class CloakConfigurator : public ConfiguratorBase
 public:
    CloakConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);

-    QSharedPointer<ProtocolConfig> createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode) override;
-
-    Vars generateProtocolVars(const ServerCredentials &credentials, DockerContainer container,
-                             const QSharedPointer<ProtocolConfig> &protocolConfig) const override;
+    QString createConfig(const ServerCredentials &credentials, DockerContainer container,
+                         const QJsonObject &containerConfig, ErrorCode &errorCode);
 };

 #endif // CLOAK_CONFIGURATOR_H
--- a/client/configurators/configurator_base.cpp
+++ b/client/configurators/configurator_base.cpp
@@ -1,58 +1,26 @@
 #include "configurator_base.h"
-#include "core/networkUtilities.h"
-#include "core/models/protocols/protocolConfig.h"
-#include <variant>

 ConfiguratorBase::ConfiguratorBase(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
    : QObject { parent }, m_settings(settings), m_serverController(serverController)
 {
 }

-void ConfiguratorBase::processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                                      QSharedPointer<ProtocolConfig> &protocolConfig)
+QString ConfiguratorBase::processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
+                                                         QString &protocolConfigString)
 {
-    processConfigWithDnsSettings(dns, protocolConfig);
+    processConfigWithDnsSettings(dns, protocolConfigString);
+    return protocolConfigString;
 }

-void ConfiguratorBase::processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                                       QSharedPointer<ProtocolConfig> &protocolConfig)
+QString ConfiguratorBase::processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
+                                                          QString &protocolConfigString)
 {
-    processConfigWithDnsSettings(dns, protocolConfig);
+    processConfigWithDnsSettings(dns, protocolConfigString);
+    return protocolConfigString;
 }

-void ConfiguratorBase::processConfigWithDnsSettings(const QPair<QString, QString> &dns, QSharedPointer<ProtocolConfig> &protocolConfig)
+void ConfiguratorBase::processConfigWithDnsSettings(const QPair<QString, QString> &dns, QString &protocolConfigString)
 {
-    ProtocolConfigVariant variant = ProtocolConfig::getProtocolConfigVariant(protocolConfig);
-    std::visit([&dns](const auto &config) -> void {
-        config->clientProtocolConfig.nativeConfig.replace("$PRIMARY_DNS", dns.first);
-        config->clientProtocolConfig.nativeConfig.replace("$SECONDARY_DNS", dns.second);
-    }, variant);
-}
-
-ConfiguratorBase::Vars ConfiguratorBase::generateProtocolVars(const ServerCredentials &credentials, DockerContainer container,
-                                                             const QSharedPointer<ProtocolConfig> &protocolConfig) const
-{
-    return generateCommonVars(credentials, container);
-}
-
-ConfiguratorBase::Vars ConfiguratorBase::generateCommonVars(const ServerCredentials &credentials, DockerContainer container) const
-{
-    Vars vars;
-
-    vars.append({{"$REMOTE_HOST", credentials.hostName}});
-
-    QString serverIp = (container != DockerContainer::Awg && container != DockerContainer::WireGuard && container != DockerContainer::Xray)
-            ? NetworkUtilities::getIPAddress(credentials.hostName)
-            : credentials.hostName;
-    if (!serverIp.isEmpty()) {
-        vars.append({{"$SERVER_IP_ADDRESS", serverIp}});
-    }
-
-    vars.append({{"$CONTAINER_NAME", ContainerProps::containerToString(container)}});
-    vars.append({{"$DOCKERFILE_FOLDER", "/opt/amnezia/" + ContainerProps::containerToString(container)}});
-
-    vars.append({{"$PRIMARY_SERVER_DNS", m_settings->primaryDns()}});
-    vars.append({{"$SECONDARY_SERVER_DNS", m_settings->secondaryDns()}});
-
-    return vars;
+    protocolConfigString.replace("$PRIMARY_DNS", dns.first);
+    protocolConfigString.replace("$SECONDARY_DNS", dns.second);
 }
--- a/client/configurators/configurator_base.h
+++ b/client/configurators/configurator_base.h
@@ -2,39 +2,28 @@
 #define CONFIGURATORBASE_H

 #include <QObject>
-#include <QList>
-#include <QPair>
-#include <QSharedPointer>

-#include "core/models/containers/containers_defs.h"
+#include "containers/containers_defs.h"
 #include "core/defs.h"
-#include "core/controllers/selfhosted/serverController.h"
-#include "core/models/protocols/protocolConfig.h"
+#include "core/controllers/serverController.h"
 #include "settings.h"

 class ConfiguratorBase : public QObject
 {
    Q_OBJECT
 public:
-    using Vars = QList<QPair<QString, QString>>;
-
    explicit ConfiguratorBase(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);

-    virtual QSharedPointer<ProtocolConfig> createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                        const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode) = 0;
+    virtual QString createConfig(const ServerCredentials &credentials, DockerContainer container,
+                                 const QJsonObject &containerConfig, ErrorCode &errorCode) = 0;

-    virtual void processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                                QSharedPointer<ProtocolConfig> &protocolConfig);
-    virtual void processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                                 QSharedPointer<ProtocolConfig> &protocolConfig);
-
-    virtual Vars generateProtocolVars(const ServerCredentials &credentials, DockerContainer container,
-                                     const QSharedPointer<ProtocolConfig> &protocolConfig) const;
+    virtual QString processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
+                                                   QString &protocolConfigString);
+    virtual QString processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
+                                                    QString &protocolConfigString);

 protected:
-    void processConfigWithDnsSettings(const QPair<QString, QString> &dns, QSharedPointer<ProtocolConfig> &protocolConfig);
-
-    Vars generateCommonVars(const ServerCredentials &credentials, DockerContainer container) const;
+    void processConfigWithDnsSettings(const QPair<QString, QString> &dns, QString &protocolConfigString);

    std::shared_ptr<Settings> m_settings;
    QSharedPointer<ServerController> m_serverController;
--- a/client/configurators/ikev2_configurator.cpp
+++ b/client/configurators/ikev2_configurator.cpp
@@ -8,11 +8,10 @@
 #include <QTemporaryFile>
 #include <QUuid>

-#include "core/models/containers/containers_defs.h"
-#include "core/controllers/selfhosted/serverController.h"
+#include "containers/containers_defs.h"
+#include "core/controllers/serverController.h"
 #include "core/scripts_registry.h"
 #include "core/server_defs.h"
-#include "protocols/protocols_defs.h"
 #include "utilities.h"

 Ikev2Configurator::Ikev2Configurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
@@ -20,28 +19,6 @@ Ikev2Configurator::Ikev2Configurator(std::shared_ptr<Settings> settings, const Q
 {
 }

-ConfiguratorBase::Vars Ikev2Configurator::generateProtocolVars(const ServerCredentials &credentials, DockerContainer container,
-                                                              const QSharedPointer<ProtocolConfig> &protocolConfig) const
-{
-    Vars vars = generateCommonVars(credentials, container);
-
-    vars.append({{"$IPSEC_VPN_L2TP_NET", "192.168.42.0/24"}});
-    vars.append({{"$IPSEC_VPN_L2TP_POOL", "192.168.42.10-192.168.42.250"}});
-    vars.append({{"$IPSEC_VPN_L2TP_LOCAL", "192.168.42.1"}});
-
-    vars.append({{"$IPSEC_VPN_XAUTH_NET", "192.168.43.0/24"}});
-    vars.append({{"$IPSEC_VPN_XAUTH_POOL", "192.168.43.10-192.168.43.250"}});
-
-    vars.append({{"$IPSEC_VPN_SHA2_TRUNCBUG", "yes"}});
-    vars.append({{"$IPSEC_VPN_VPN_ANDROID_MTU_FIX", "yes"}});
-    vars.append({{"$IPSEC_VPN_DISABLE_IKEV2", "no"}});
-    vars.append({{"$IPSEC_VPN_DISABLE_L2TP", "no"}});
-    vars.append({{"$IPSEC_VPN_DISABLE_XAUTH", "no"}});
-    vars.append({{"$IPSEC_VPN_C2C_TRAFFIC", "no"}});
-
-    return vars;
-}
-
 Ikev2Configurator::ConnectionData Ikev2Configurator::prepareIkev2Config(const ServerCredentials &credentials, DockerContainer container,
                                                                        ErrorCode &errorCode)
 {
@@ -77,58 +54,21 @@ Ikev2Configurator::ConnectionData Ikev2Configurator::prepareIkev2Config(const Se
    return connData;
 }

-QSharedPointer<ProtocolConfig> Ikev2Configurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                            const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode)
+QString Ikev2Configurator::createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
+                                        ErrorCode &errorCode)
 {
-    Q_UNUSED(protocolConfig)
-
-    // IKEv2 uses a generic ProtocolConfig - no specific subclass needed
-    if (!protocolConfig) {
-        errorCode = ErrorCode::InternalError;
-        return nullptr;
-    }
+    Q_UNUSED(containerConfig)

    ConnectionData connData = prepareIkev2Config(credentials, container, errorCode);
    if (errorCode != ErrorCode::NoError) {
-        return nullptr;
+        return "";
    }

-    auto ikev2Config = qSharedPointerCast<Ikev2ProtocolConfig>(protocolConfig);
-    if (!ikev2Config) {
-        errorCode = ErrorCode::InternalError;
-        return nullptr;
-    }
-
-    ikev2Config->clientProtocolConfig.isEmpty = false;
-    ikev2Config->clientProtocolConfig.hostName = connData.host;
-    ikev2Config->clientProtocolConfig.userName = connData.clientId;
-    ikev2Config->clientProtocolConfig.cert = QString(connData.clientCert.toBase64());
-    ikev2Config->clientProtocolConfig.password = connData.password;
-
-    // Generate the appropriate native config based on platform
-    QString nativeConfigStr;
-    switch (Utils::systemType()) {
-    case SystemType::iOS:
-        [[fallthrough]];
-    case SystemType::macOS:
-        nativeConfigStr = genMobileConfig(connData);
-        break;
-    case SystemType::Android:
-        nativeConfigStr = genIkev2Config(connData);
-        break;
-    default:
-        nativeConfigStr = genStrongSwanConfig(connData);
-        break;
-    }
-
-    ikev2Config->clientProtocolConfig.nativeConfig = nativeConfigStr;
-    
-    return ikev2Config;
+    return genIkev2Config(connData);
 }

 QString Ikev2Configurator::genIkev2Config(const ConnectionData &connData)
 {
-    // Create temporary JSON for Android platform (will be eliminated when android protocols are updated)
    QJsonObject config;
    config[config_key::hostName] = connData.host;
    config[config_key::userName] = connData.clientId;
--- a/client/configurators/ikev2_configurator.h
+++ b/client/configurators/ikev2_configurator.h
@@ -5,8 +5,6 @@
 #include <QProcessEnvironment>

 #include "configurator_base.h"
-#include "core/models/protocols/protocolConfig.h"
-#include "core/models/protocols/ikev2ProtocolConfig.h"
 #include "core/defs.h"

 class Ikev2Configurator : public ConfiguratorBase
@@ -23,16 +21,13 @@ public:
        QString host; // host ip
    };

-    QSharedPointer<ProtocolConfig> createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode) override;
+    QString createConfig(const ServerCredentials &credentials, DockerContainer container,
+                         const QJsonObject &containerConfig, ErrorCode &errorCode);

    QString genIkev2Config(const ConnectionData &connData);
    QString genMobileConfig(const ConnectionData &connData);
    QString genStrongSwanConfig(const ConnectionData &connData);

-    Vars generateProtocolVars(const ServerCredentials &credentials, DockerContainer container,
-                             const QSharedPointer<ProtocolConfig> &protocolConfig) const override;
-
    ConnectionData prepareIkev2Config(const ServerCredentials &credentials,
        DockerContainer container, ErrorCode &errorCode);
 };
--- a/client/configurators/openvpn_configurator.cpp
+++ b/client/configurators/openvpn_configurator.cpp
@@ -1,7 +1,8 @@
 #include "openvpn_configurator.h"

 #include <QDebug>
-
+#include <QJsonDocument>
+#include <QJsonObject>
 #include <QProcess>
 #include <QString>
 #include <QTemporaryDir>
@@ -12,14 +13,10 @@
    #include <QApplication>
 #endif

-#include "core/networkUtilities.h"
-#include "core/models/protocols/protocolConfig.h"
-#include <variant>
-#include "core/models/containers/containers_defs.h"
-#include "core/controllers/selfhosted/serverController.h"
+#include "containers/containers_defs.h"
+#include "core/controllers/serverController.h"
 #include "core/scripts_registry.h"
-#include "core/models/protocols/openvpnProtocolConfig.h"
-#include "protocols/protocols_defs.h"
+#include "core/server_defs.h"
 #include "settings.h"
 #include "utilities.h"

@@ -27,46 +24,12 @@
 #include <openssl/rsa.h>
 #include <openssl/x509.h>

-
 OpenVpnConfigurator::OpenVpnConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController,
                                         QObject *parent)
    : ConfiguratorBase(settings, serverController, parent)
 {
 }

-ConfiguratorBase::Vars OpenVpnConfigurator::generateProtocolVars(const ServerCredentials &credentials, DockerContainer container,
-                                                                 const QSharedPointer<ProtocolConfig> &protocolConfig) const
-{
-    Vars vars = generateCommonVars(credentials, container);
-
-    auto openVpnConfig = qSharedPointerCast<OpenVpnProtocolConfig>(protocolConfig);
-    if (!openVpnConfig) {
-        return vars;
-    }
-
-    vars.append({{"$OPENVPN_SUBNET_IP", openVpnConfig->serverProtocolConfig.subnetAddress}});
-    vars.append({{"$OPENVPN_SUBNET_CIDR", protocols::openvpn::defaultSubnetCidr}});
-    vars.append({{"$OPENVPN_SUBNET_MASK", protocols::openvpn::defaultSubnetMask}});
-
-    vars.append({{"$OPENVPN_PORT", openVpnConfig->serverProtocolConfig.port}});
-    vars.append({{"$OPENVPN_TRANSPORT_PROTO", openVpnConfig->serverProtocolConfig.transportProto}});
-
-    vars.append({{"$OPENVPN_NCP_DISABLE", openVpnConfig->serverProtocolConfig.ncpDisable ? protocols::openvpn::ncpDisableString : ""}});
-
-    vars.append({{"$OPENVPN_CIPHER", openVpnConfig->serverProtocolConfig.cipher}});
-    vars.append({{"$OPENVPN_HASH", openVpnConfig->serverProtocolConfig.hash}});
-
-    vars.append({{"$OPENVPN_TLS_AUTH", openVpnConfig->serverProtocolConfig.tlsAuth ? protocols::openvpn::tlsAuthString : ""}});
-    if (!openVpnConfig->serverProtocolConfig.tlsAuth) {
-        vars.append({{"$OPENVPN_TA_KEY", ""}});
-    }
-
-    vars.append({{"$OPENVPN_ADDITIONAL_CLIENT_CONFIG", openVpnConfig->serverProtocolConfig.additionalClientConfig}});
-    vars.append({{"$OPENVPN_ADDITIONAL_SERVER_CONFIG", openVpnConfig->serverProtocolConfig.additionalServerConfig}});
-
-    return vars;
-}
-
 OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::prepareOpenVpnConfig(const ServerCredentials &credentials,
                                                                              DockerContainer container, ErrorCode &errorCode)
 {
@@ -108,21 +71,15 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::prepareOpenVpnConfig(co
    return connData;
 }

-QSharedPointer<ProtocolConfig> OpenVpnConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                                const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode)
+QString OpenVpnConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
+                                          const QJsonObject &containerConfig, ErrorCode &errorCode)
 {
-    auto openVpnConfig = qSharedPointerCast<OpenVpnProtocolConfig>(protocolConfig);
-    if (!openVpnConfig) {
-        errorCode = ErrorCode::InternalError;
-        return nullptr;
-    }
-
    QString config = m_serverController->replaceVars(amnezia::scriptData(ProtocolScriptType::openvpn_template, container),
-                                                     generateProtocolVars(credentials, container, protocolConfig));
+                                                     m_serverController->genVarsForScript(credentials, container, containerConfig));

    ConnectionData connData = prepareOpenVpnConfig(credentials, container, errorCode);
    if (errorCode != ErrorCode::NoError) {
-        return nullptr;
+        return "";
    }

    config.replace("$OPENVPN_CA_CERT", connData.caCert);
@@ -140,100 +97,86 @@ QSharedPointer<ProtocolConfig> OpenVpnConfigurator::createConfig(const ServerCre
    config.replace("block-outside-dns", "");
 #endif

-    openVpnConfig->clientProtocolConfig.isEmpty = false;
-    openVpnConfig->clientProtocolConfig.clientId = connData.clientId;
-    openVpnConfig->clientProtocolConfig.nativeConfig = config;
+    QJsonObject jConfig;
+    jConfig[config_key::config] = config;

-    return openVpnConfig;
+    jConfig[config_key::clientId] = connData.clientId;
+
+    return QJsonDocument(jConfig).toJson();
 }

-void OpenVpnConfigurator::processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                                         QSharedPointer<ProtocolConfig> &protocolConfig)
+QString OpenVpnConfigurator::processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
+                                                            QString &protocolConfigString)
 {
-    processConfigWithDnsSettings(dns, protocolConfig);
+    processConfigWithDnsSettings(dns, protocolConfigString);

-    ProtocolConfigVariant variant = ProtocolConfig::getProtocolConfigVariant(protocolConfig);
-    std::visit([this, &dns, isApiConfig](const auto &config) -> void {
-        if constexpr (std::is_same_v<std::decay_t<decltype(config)>, QSharedPointer<OpenVpnProtocolConfig>>) {
-            QString &nativeConfig = config->clientProtocolConfig.nativeConfig;
+    QJsonObject json = QJsonDocument::fromJson(protocolConfigString.toUtf8()).object();
+    QString config = json[config_key::config].toString();

-            if (!isApiConfig) {
-                QRegularExpression regex("redirect-gateway.*");
-                nativeConfig.replace(regex, "");
-                
-                // We don't use secondary DNS if primary DNS is AmneziaDNS
-                if (dns.first.contains(protocols::dns::amneziaDnsIp)) {
-                    QRegularExpression dnsRegex("dhcp-option DNS " + dns.second);
-                    nativeConfig.replace(dnsRegex, "");
-                }
+    if (!isApiConfig) {
+        QRegularExpression regex("redirect-gateway.*");
+        config.replace(regex, "");
+        
+        if (!m_settings->isSitesSplitTunnelingEnabled()) {
+            config.append("\nredirect-gateway def1 ipv6 bypass-dhcp\n");

-                if (!m_settings->isSitesSplitTunnelingEnabled()) {
-                    nativeConfig.append("\nredirect-gateway def1 ipv6 bypass-dhcp\n");
-                    nativeConfig.append("block-ipv6\n");
-                } else if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
-
-                   // no redirect-gateway
-                } else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
 #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-                    nativeConfig.append("\nredirect-gateway ipv6 !ipv4 bypass-dhcp\n");
-                    // Prevent ipv6 leak
+            // Prevent ipv6 leak
+            config.append("ifconfig-ipv6 fd15:53b6:dead::2/64  fd15:53b6:dead::1\n");
 #endif
-                    nativeConfig.append("block-ipv6\n");
-                }
+            config.append("block-ipv6\n");
+        } else if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {

-                QStringList routeList = m_settings->vpnRoutes();
-
-                if (!routeList.isEmpty()) {
-                    for (auto route : routeList) {
-                        nativeConfig.append("\nroute " + route + " 255.255.255.255 vpn_gateway\n");
-                    }
-                }
-            }
+            // no redirect-gateway
+        } else if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+            config.append("\nredirect-gateway ipv6 !ipv4 bypass-dhcp\n");
+            // Prevent ipv6 leak
+            config.append("ifconfig-ipv6 fd15:53b6:dead::2/64  fd15:53b6:dead::1\n");
+#endif
+            config.append("block-ipv6\n");
+        }
+    }

 #ifndef MZ_WINDOWS
-            nativeConfig.replace("block-outside-dns", "");
+    config.replace("block-outside-dns", "");
 #endif

 #if (defined(MZ_MACOS) || defined(MZ_LINUX))
-            QString dnsConf = QString("\nscript-security 2\n"
-                                      "up %1/update-resolv-conf.sh\n"
-                                      "down %1/update-resolv-conf.sh\n")
-                                      .arg(qApp->applicationDirPath());
+    QString dnsConf = QString("\nscript-security 2\n"
+                              "up %1/update-resolv-conf.sh\n"
+                              "down %1/update-resolv-conf.sh\n")
+                              .arg(qApp->applicationDirPath());

-            nativeConfig.append(dnsConf);
+    config.append(dnsConf);
 #endif
-        }
-    }, variant);
+
+    json[config_key::config] = config;
+    return QJsonDocument(json).toJson();
 }

-void OpenVpnConfigurator::processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                                          QSharedPointer<ProtocolConfig> &protocolConfig)
+QString OpenVpnConfigurator::processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
+                                                             QString &protocolConfigString)
 {
-    processConfigWithDnsSettings(dns, protocolConfig);
+    processConfigWithDnsSettings(dns, protocolConfigString);

-    ProtocolConfigVariant variant = ProtocolConfig::getProtocolConfigVariant(protocolConfig);
-    std::visit([&dns](const auto &config) -> void {
-        if constexpr (std::is_same_v<std::decay_t<decltype(config)>, QSharedPointer<OpenVpnProtocolConfig>>) {
-            QString &nativeConfig = config->clientProtocolConfig.nativeConfig;
+    QJsonObject json = QJsonDocument::fromJson(protocolConfigString.toUtf8()).object();
+    QString config = json[config_key::config].toString();

-            QRegularExpression regex("redirect-gateway.*");
-            nativeConfig.replace(regex, "");
+    QRegularExpression regex("redirect-gateway.*");
+    config.replace(regex, "");

-            // We don't use secondary DNS if primary DNS is AmneziaDNS
-            if (dns.first.contains(protocols::dns::amneziaDnsIp)) {
-                QRegularExpression dnsRegex("dhcp-option DNS " + dns.second);
-                nativeConfig.replace(dnsRegex, "");
-            }
+    config.append("\nredirect-gateway def1 ipv6 bypass-dhcp\n");

-            nativeConfig.append("\nredirect-gateway def1 ipv6 bypass-dhcp\n");
+    // Prevent ipv6 leak
+    config.append("ifconfig-ipv6 fd15:53b6:dead::2/64  fd15:53b6:dead::1\n");
+    config.append("block-ipv6\n");

-            // Prevent ipv6 leak
-            nativeConfig.append("block-ipv6\n");
+    // remove block-outside-dns for all exported configs
+    config.replace("block-outside-dns", "");

-            // remove block-outside-dns for all exported configs
-            nativeConfig.replace("block-outside-dns", "");
-        }
-    }, variant);
+    json[config_key::config] = config;
+    return QJsonDocument(json).toJson();
 }

 ErrorCode OpenVpnConfigurator::signCert(DockerContainer container, const ServerCredentials &credentials, QString clientId)
@@ -250,7 +193,7 @@ ErrorCode OpenVpnConfigurator::signCert(DockerContainer container, const ServerC
                                  .arg(clientId);

    QStringList scriptList { script_import, script_sign };
-    QString script = m_serverController->replaceVars(scriptList.join("\n"), generateProtocolVars(credentials, container));
+    QString script = m_serverController->replaceVars(scriptList.join("\n"), m_serverController->genVarsForScript(credentials, container));

    return m_serverController->runScript(credentials, script);
 }
--- a/client/configurators/openvpn_configurator.h
+++ b/client/configurators/openvpn_configurator.h
@@ -6,7 +6,6 @@

 #include "configurator_base.h"
 #include "core/defs.h"
-#include "core/models/protocols/openvpnProtocolConfig.h"

 class OpenVpnConfigurator : public ConfiguratorBase
 {
@@ -25,16 +24,13 @@ public:
        QString host;       // host ip
    };

-    QSharedPointer<ProtocolConfig> createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode) override;
+    QString createConfig(const ServerCredentials &credentials, DockerContainer container,
+                         const QJsonObject &containerConfig, ErrorCode &errorCode);

-    void processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                        QSharedPointer<ProtocolConfig> &protocolConfig) override;
-    void processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                         QSharedPointer<ProtocolConfig> &protocolConfig) override;
-
-    Vars generateProtocolVars(const ServerCredentials &credentials, DockerContainer container,
-                             const QSharedPointer<ProtocolConfig> &protocolConfig) const override;
+    QString processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
+                                           QString &protocolConfigString);
+    QString processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
+                                            QString &protocolConfigString);

    static ConnectionData createCertRequest();

--- a/client/configurators/shadowsocks_configurator.cpp
+++ b/client/configurators/shadowsocks_configurator.cpp
@@ -4,10 +4,8 @@
 #include <QJsonDocument>
 #include <QJsonObject>

-#include "core/models/containers/containers_defs.h"
-#include "core/controllers/selfhosted/serverController.h"
-#include "core/models/protocols/shadowsocksProtocolConfig.h"
-#include "protocols/protocols_defs.h"
+#include "containers/containers_defs.h"
+#include "core/controllers/serverController.h"

 ShadowSocksConfigurator::ShadowSocksConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController,
                                                 QObject *parent)
@@ -15,59 +13,28 @@ ShadowSocksConfigurator::ShadowSocksConfigurator(std::shared_ptr<Settings> setti
 {
 }

-ConfiguratorBase::Vars ShadowSocksConfigurator::generateProtocolVars(const ServerCredentials &credentials, DockerContainer container,
-                                                                     const QSharedPointer<ProtocolConfig> &protocolConfig) const
+QString ShadowSocksConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
+                                              const QJsonObject &containerConfig, ErrorCode &errorCode)
 {
-    Vars vars = generateCommonVars(credentials, container);
-
-    auto shadowsocksConfig = qSharedPointerCast<ShadowsocksProtocolConfig>(protocolConfig);
-    if (!shadowsocksConfig) {
-        return vars;
-    }
-
-    vars.append({{"$SHADOWSOCKS_SERVER_PORT", shadowsocksConfig->serverProtocolConfig.port}});
-    vars.append({{"$SHADOWSOCKS_LOCAL_PORT", protocols::shadowsocks::defaultLocalProxyPort}});
-    vars.append({{"$SHADOWSOCKS_CIPHER", shadowsocksConfig->serverProtocolConfig.cipher}});
-
-    return vars;
-}
-
-QSharedPointer<ProtocolConfig> ShadowSocksConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                                  const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode)
-{
-    auto shadowsocksConfig = qSharedPointerCast<ShadowsocksProtocolConfig>(protocolConfig);
-    if (!shadowsocksConfig) {
-        errorCode = ErrorCode::InternalError;
-        return nullptr;
-    }
-
    QString ssKey =
            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::shadowsocks::ssKeyPath, errorCode);
    ssKey.replace("\n", "");

    if (errorCode != ErrorCode::NoError) {
-        return nullptr;
+        return "";
    }

-    shadowsocksConfig->clientProtocolConfig.server = credentials.hostName;
-    shadowsocksConfig->clientProtocolConfig.serverPort = shadowsocksConfig->serverProtocolConfig.port;
-    shadowsocksConfig->clientProtocolConfig.localPort = protocols::shadowsocks::defaultLocalProxyPort;
-    shadowsocksConfig->clientProtocolConfig.password = ssKey;
-    shadowsocksConfig->clientProtocolConfig.timeout = 60;
-    shadowsocksConfig->clientProtocolConfig.method = shadowsocksConfig->serverProtocolConfig.cipher;
-
    QJsonObject config;
-    config.insert("server", shadowsocksConfig->clientProtocolConfig.server);
-    config.insert("server_port", shadowsocksConfig->clientProtocolConfig.serverPort);
-    config.insert("local_port", shadowsocksConfig->clientProtocolConfig.localPort);
-    config.insert("password", shadowsocksConfig->clientProtocolConfig.password);
-    config.insert("timeout", shadowsocksConfig->clientProtocolConfig.timeout);
-    config.insert("method", shadowsocksConfig->clientProtocolConfig.method);
+    config.insert("server", credentials.hostName);
+    config.insert("server_port", "$SHADOWSOCKS_SERVER_PORT");
+    config.insert("local_port", "$SHADOWSOCKS_LOCAL_PORT");
+    config.insert("password", ssKey);
+    config.insert("timeout", 60);
+    config.insert("method", "$SHADOWSOCKS_CIPHER");

-    QString textCfg = QJsonDocument(config).toJson();
+    QString textCfg = m_serverController->replaceVars(QJsonDocument(config).toJson(),
+                                                      m_serverController->genVarsForScript(credentials, container, containerConfig));

-    shadowsocksConfig->clientProtocolConfig.isEmpty = false;
-    shadowsocksConfig->clientProtocolConfig.nativeConfig = textCfg;
-
-    return shadowsocksConfig;
+    // qDebug().noquote() << textCfg;
+    return textCfg;
 }
--- a/client/configurators/shadowsocks_configurator.h
+++ b/client/configurators/shadowsocks_configurator.h
@@ -4,7 +4,6 @@
 #include <QObject>

 #include "configurator_base.h"
-#include "core/models/protocols/shadowsocksProtocolConfig.h"
 #include "core/defs.h"

 class ShadowSocksConfigurator : public ConfiguratorBase
@@ -13,11 +12,8 @@ class ShadowSocksConfigurator : public ConfiguratorBase
 public:
    ShadowSocksConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);

-    QSharedPointer<ProtocolConfig> createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode) override;
-
-    Vars generateProtocolVars(const ServerCredentials &credentials, DockerContainer container,
-                             const QSharedPointer<ProtocolConfig> &protocolConfig) const override;
+    QString createConfig(const ServerCredentials &credentials, DockerContainer container,
+                         const QJsonObject &containerConfig, ErrorCode &errorCode);
 };

 #endif // SHADOWSOCKS_CONFIGURATOR_H
--- a/client/configurators/wireguard_configurator.cpp
+++ b/client/configurators/wireguard_configurator.cpp
@@ -3,86 +3,35 @@
 #include <QDebug>
 #include <QJsonDocument>
 #include <QProcess>
-#include <QRegularExpression>
 #include <QString>
 #include <QTemporaryDir>
 #include <QTemporaryFile>
-#include <type_traits>
-#include <variant>

 #include <openssl/pem.h>
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
 #include <openssl/x509.h>

-#include "core/models/containers/containers_defs.h"
-#include "core/controllers/selfhosted/serverController.h"
+#include "containers/containers_defs.h"
+#include "core/controllers/serverController.h"
 #include "core/scripts_registry.h"
 #include "core/server_defs.h"
-#include "core/models/protocols/wireguardProtocolConfig.h"
-#include "core/models/protocols/awgProtocolConfig.h"
-#include "protocols/protocols_defs.h"
 #include "settings.h"
 #include "utilities.h"

-WireguardConfigurator::WireguardConfigurator(std::shared_ptr<Settings> settings,
-                                             const QSharedPointer<ServerController> &serverController, bool isAwg,
-                                             QObject *parent)
+WireguardConfigurator::WireguardConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController,
+                                             bool isAwg, QObject *parent)
    : ConfiguratorBase(settings, serverController, parent), m_isAwg(isAwg)
 {
-    m_serverConfigPath =
-            m_isAwg ? amnezia::protocols::awg::serverConfigPath : amnezia::protocols::wireguard::serverConfigPath;
-    m_serverPublicKeyPath =
-            m_isAwg ? amnezia::protocols::awg::serverPublicKeyPath : amnezia::protocols::wireguard::serverPublicKeyPath;
-    m_serverPskKeyPath =
-            m_isAwg ? amnezia::protocols::awg::serverPskKeyPath : amnezia::protocols::wireguard::serverPskKeyPath;
+    m_serverConfigPath = m_isAwg ? amnezia::protocols::awg::serverConfigPath : amnezia::protocols::wireguard::serverConfigPath;
+    m_serverPublicKeyPath = m_isAwg ? amnezia::protocols::awg::serverPublicKeyPath : amnezia::protocols::wireguard::serverPublicKeyPath;
+    m_serverPskKeyPath = m_isAwg ? amnezia::protocols::awg::serverPskKeyPath : amnezia::protocols::wireguard::serverPskKeyPath;
    m_configTemplate = m_isAwg ? ProtocolScriptType::awg_template : ProtocolScriptType::wireguard_template;

    m_protocolName = m_isAwg ? config_key::awg : config_key::wireguard;
    m_defaultPort = m_isAwg ? protocols::wireguard::defaultPort : protocols::awg::defaultPort;
 }

-ConfiguratorBase::Vars WireguardConfigurator::generateProtocolVars(const ServerCredentials &credentials, DockerContainer container,
-                                                                   const QSharedPointer<ProtocolConfig> &protocolConfig) const
-{
-    Vars vars = generateCommonVars(credentials, container);
-
-    if (m_isAwg) {
-        auto awgConfig = qSharedPointerCast<AwgProtocolConfig>(protocolConfig);
-        if (!awgConfig) {
-            return vars;
-        }
-
-        vars.append({{"$AWG_SUBNET_IP", awgConfig->serverProtocolConfig.subnetAddress}});
-        vars.append({{"$AWG_SERVER_PORT", awgConfig->serverProtocolConfig.port}});
-
-        const auto &awgData = awgConfig->serverProtocolConfig.awgData;
-        vars.append({{"$JUNK_PACKET_COUNT", awgData.junkPacketCount}});
-        vars.append({{"$JUNK_PACKET_MIN_SIZE", awgData.junkPacketMinSize}});
-        vars.append({{"$JUNK_PACKET_MAX_SIZE", awgData.junkPacketMaxSize}});
-        vars.append({{"$INIT_PACKET_JUNK_SIZE", awgData.initPacketJunkSize}});
-        vars.append({{"$RESPONSE_PACKET_JUNK_SIZE", awgData.responsePacketJunkSize}});
-        vars.append({{"$INIT_PACKET_MAGIC_HEADER", awgData.initPacketMagicHeader}});
-        vars.append({{"$RESPONSE_PACKET_MAGIC_HEADER", awgData.responsePacketMagicHeader}});
-        vars.append({{"$UNDERLOAD_PACKET_MAGIC_HEADER", awgData.underloadPacketMagicHeader}});
-        vars.append({{"$TRANSPORT_PACKET_MAGIC_HEADER", awgData.transportPacketMagicHeader}});
-        vars.append({{"$COOKIE_REPLY_PACKET_JUNK_SIZE", awgData.cookieReplyPacketJunkSize}});
-        vars.append({{"$TRANSPORT_PACKET_JUNK_SIZE", awgData.transportPacketJunkSize}});
-    } else {
-        auto wgConfig = qSharedPointerCast<WireGuardProtocolConfig>(protocolConfig);
-        if (!wgConfig) {
-            return vars;
-        }
-
-        vars.append({{"$WIREGUARD_SUBNET_IP", wgConfig->serverProtocolConfig.subnetAddress}});
-        vars.append({{"$WIREGUARD_SUBNET_CIDR", protocols::wireguard::defaultSubnetCidr}});
-        vars.append({{"$WIREGUARD_SUBNET_MASK", protocols::wireguard::defaultSubnetMask}});
-        vars.append({{"$WIREGUARD_SERVER_PORT", wgConfig->serverProtocolConfig.port}});
-    }
-
-    return vars;
-}
-
 WireguardConfigurator::ConnectionData WireguardConfigurator::genClientKeys()
 {
    // TODO review
@@ -114,94 +63,78 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::genClientKeys()
    return connData;
 }

-QList<QHostAddress> WireguardConfigurator::getIpsFromConf(const QString &input)
-{
-    QRegularExpression regex("AllowedIPs = (\\d+\\.\\d+\\.\\d+\\.\\d+)");
-    QRegularExpressionMatchIterator matchIterator = regex.globalMatch(input);
-
-    QList<QHostAddress> ips;
-
-    while (matchIterator.hasNext()) {
-        QRegularExpressionMatch match = matchIterator.next();
-        const QString address_string { match.captured(1) };
-        const QHostAddress address { address_string };
-        if (address.isNull()) {
-            qWarning() << "Couldn't recognize the ip address: " << address_string;
-        } else {
-            ips << address;
-        }
-    }
-
-    return ips;
-}
-
 WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardConfig(const ServerCredentials &credentials,
                                                                                    DockerContainer container,
-                                                                                    const QSharedPointer<ProtocolConfig> &protocolConfig,
-                                                                                    ErrorCode &errorCode)
+                                                                                    const QJsonObject &containerConfig, ErrorCode &errorCode)
 {
    WireguardConfigurator::ConnectionData connData = WireguardConfigurator::genClientKeys();
    connData.host = credentials.hostName;
-    
-    // Extract port from appropriate protocol config
-    if (m_isAwg) {
-        auto awgConfig = qSharedPointerCast<AwgProtocolConfig>(protocolConfig);
-        connData.port = awgConfig ? awgConfig->serverProtocolConfig.port : m_defaultPort;
-    } else {
-        auto wgConfig = qSharedPointerCast<WireGuardProtocolConfig>(protocolConfig);
-        connData.port = wgConfig ? wgConfig->serverProtocolConfig.port : m_defaultPort;
-    }
+    connData.port = containerConfig.value(m_protocolName).toObject().value(config_key::port).toString(m_defaultPort);

    if (connData.clientPrivKey.isEmpty() || connData.clientPubKey.isEmpty()) {
        errorCode = ErrorCode::InternalError;
        return connData;
    }

-    QString getIpsScript = QString("cat %1 | grep AllowedIPs").arg(m_serverConfigPath);
-    QString stdOut;
-    auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
-        stdOut += data + "\n";
-        return ErrorCode::NoError;
-    };
+    // Get list of already created clients (only IP addresses)
+    QString nextIpNumber;
+    {
+        QString script = QString("cat %1 | grep AllowedIPs").arg(m_serverConfigPath);
+        QString stdOut;
+        auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
+            stdOut += data + "\n";
+            return ErrorCode::NoError;
+        };

-    errorCode = m_serverController->runContainerScript(credentials, container, getIpsScript, cbReadStdOut);
-    if (errorCode != ErrorCode::NoError) {
-        return connData;
-    }
-    auto ips = getIpsFromConf(stdOut);
+        errorCode = m_serverController->runContainerScript(credentials, container, script, cbReadStdOut);
+        if (errorCode != ErrorCode::NoError) {
+            return connData;
+        }

-    QHostAddress nextIp = [&] {
-        QHostAddress result;
-        QHostAddress lastIp;
-        if (ips.empty()) {
-            // Get subnet from protocol config
-            QString subnetAddress;
-            if (m_isAwg) {
-                auto awgConfig = qSharedPointerCast<AwgProtocolConfig>(protocolConfig);
-                subnetAddress = awgConfig ? awgConfig->serverProtocolConfig.subnetAddress : protocols::wireguard::defaultSubnetAddress;
-            } else {
-                auto wgConfig = qSharedPointerCast<WireGuardProtocolConfig>(protocolConfig);
-                subnetAddress = wgConfig ? wgConfig->serverProtocolConfig.subnetAddress : protocols::wireguard::defaultSubnetAddress;
-            }
-            lastIp.setAddress(subnetAddress);
+        stdOut.replace("AllowedIPs = ", "");
+        stdOut.replace("/32", "");
+        QStringList ips = stdOut.split("\n", Qt::SkipEmptyParts);
+
+        // remove extra IPs from each line for case when user manually edited the wg0.conf
+        // and added there more IPs for route his itnernal networks, like:
+        //     ...
+        //     AllowedIPs = 10.8.1.6/32, 192.168.1.0/24, 192.168.2.0/24, ...
+        //     ...
+        // without this code - next IP would be 1 if last item in 'ips' has format above
+        QStringList vpnIps;
+        for (const auto &ip : ips) {
+          vpnIps.append(ip.split(",", Qt::SkipEmptyParts).first().trimmed());
+        }
+        ips = vpnIps;
+
+        // Calc next IP address
+        if (ips.isEmpty()) {
+            nextIpNumber = "2";
        } else {
-            lastIp = ips.last();
+            int next = ips.last().split(".").last().toInt() + 1;
+            if (next > 254) {
+                errorCode = ErrorCode::AddressPoolError;
+                return connData;
+            }
+            nextIpNumber = QString::number(next);
        }
-        quint8 lastOctet = static_cast<quint8>(lastIp.toIPv4Address());
-        switch (lastOctet) {
-        case 254: result.setAddress(lastIp.toIPv4Address() + 3); break;
-        case 255: result.setAddress(lastIp.toIPv4Address() + 2); break;
-        default: result.setAddress(lastIp.toIPv4Address() + 1); break;
+    }
+
+    QString subnetIp = containerConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
+    {
+        QStringList l = subnetIp.split(".", Qt::SkipEmptyParts);
+        if (l.isEmpty()) {
+            errorCode = ErrorCode::AddressPoolError;
+            return connData;
        }
+        l.removeLast();
+        l.append(nextIpNumber);

-        return result;
-    }();
-
-    connData.clientIP = nextIp.toString();
+        connData.clientIP = l.join(".");
+    }

    // Get keys
-    connData.serverPubKey =
-            m_serverController->getTextFileFromContainer(container, credentials, m_serverPublicKeyPath, errorCode);
+    connData.serverPubKey = m_serverController->getTextFileFromContainer(container, credentials, m_serverPublicKeyPath, errorCode);
    connData.serverPubKey.replace("\n", "");
    if (errorCode != ErrorCode::NoError) {
        return connData;
@@ -228,44 +161,24 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
        return connData;
    }

-    QString script = QString("sudo docker exec -i $CONTAINER_NAME bash -c 'wg syncconf wg0 <(wg-quick strip %1)'")
-                             .arg(m_serverConfigPath);
+    QString script = QString("sudo docker exec -i $CONTAINER_NAME bash -c 'wg syncconf wg0 <(wg-quick strip %1)'").arg(m_serverConfigPath);

    errorCode = m_serverController->runScript(
-            credentials,
-            m_serverController->replaceVars(script, generateProtocolVars(credentials, container)));
+            credentials, m_serverController->replaceVars(script, m_serverController->genVarsForScript(credentials, container)));

    return connData;
 }

-QSharedPointer<ProtocolConfig> WireguardConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                               const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode)
+QString WireguardConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
+                                            const QJsonObject &containerConfig, ErrorCode &errorCode)
 {
-    QSharedPointer<ProtocolConfig> result;
-    
-    if (m_isAwg) {
-        auto awgConfig = qSharedPointerCast<AwgProtocolConfig>(protocolConfig);
-        if (!awgConfig) {
-            errorCode = ErrorCode::InternalError;
-            return nullptr;
-        }
-        result = awgConfig;
-    } else {
-        auto wgConfig = qSharedPointerCast<WireGuardProtocolConfig>(protocolConfig);
-        if (!wgConfig) {
-            errorCode = ErrorCode::InternalError;
-            return nullptr;
-        }
-        result = wgConfig;
-    }
-
    QString scriptData = amnezia::scriptData(m_configTemplate, container);
-    QString config = m_serverController->replaceVars(
-            scriptData, generateProtocolVars(credentials, container, protocolConfig));
+    QString config =
+            m_serverController->replaceVars(scriptData, m_serverController->genVarsForScript(credentials, container, containerConfig));

-    ConnectionData connData = prepareWireguardConfig(credentials, container, protocolConfig, errorCode);
+    ConnectionData connData = prepareWireguardConfig(credentials, container, containerConfig, errorCode);
    if (errorCode != ErrorCode::NoError) {
-        return nullptr;
+        return "";
    }

    config.replace("$WIREGUARD_CLIENT_PRIVATE_KEY", connData.clientPrivKey);
@@ -273,37 +186,40 @@ QSharedPointer<ProtocolConfig> WireguardConfigurator::createConfig(const ServerC
    config.replace("$WIREGUARD_SERVER_PUBLIC_KEY", connData.serverPubKey);
    config.replace("$WIREGUARD_PSK", connData.pskKey);

-    ProtocolConfigVariant variant = ProtocolConfig::getProtocolConfigVariant(result);
-    std::visit([&connData, &config](const auto &protocolConfig) -> void {
-        using ConfigType = std::decay_t<decltype(*protocolConfig)>;
-        if constexpr (std::is_same_v<ConfigType, AwgProtocolConfig> || std::is_same_v<ConfigType, WireGuardProtocolConfig>) {
-            protocolConfig->clientProtocolConfig.isEmpty = false;
-            protocolConfig->clientProtocolConfig.clientId = connData.clientPubKey;
-            protocolConfig->clientProtocolConfig.hostname = connData.host;
-            protocolConfig->clientProtocolConfig.port = connData.port.toInt();
-            protocolConfig->clientProtocolConfig.wireGuardData.clientPrivateKey = connData.clientPrivKey;
-            protocolConfig->clientProtocolConfig.wireGuardData.clientIp = connData.clientIP;
-            protocolConfig->clientProtocolConfig.wireGuardData.clientPublicKey = connData.clientPubKey;
-            protocolConfig->clientProtocolConfig.wireGuardData.pskKey = connData.pskKey;
-            protocolConfig->clientProtocolConfig.wireGuardData.serverPubKey = connData.serverPubKey;
-            protocolConfig->clientProtocolConfig.wireGuardData.mtu = protocolConfig->serverProtocolConfig.mtu;
-            protocolConfig->clientProtocolConfig.wireGuardData.persistentKeepAlive = "25";
-            protocolConfig->clientProtocolConfig.wireGuardData.allowedIps = QStringList{"0.0.0.0/0", "::/0"};
-            protocolConfig->clientProtocolConfig.nativeConfig = config;
-        }
-    }, variant);
+    const QJsonObject &wireguarConfig = containerConfig.value(ProtocolProps::protoToString(Proto::WireGuard)).toObject();
+    QJsonObject jConfig;
+    jConfig[config_key::config] = config;

-    return result;
+    jConfig[config_key::hostName] = connData.host;
+    jConfig[config_key::port] = connData.port.toInt();
+    jConfig[config_key::client_priv_key] = connData.clientPrivKey;
+    jConfig[config_key::client_ip] = connData.clientIP;
+    jConfig[config_key::client_pub_key] = connData.clientPubKey;
+    jConfig[config_key::psk_key] = connData.pskKey;
+    jConfig[config_key::server_pub_key] = connData.serverPubKey;
+    jConfig[config_key::mtu] = wireguarConfig.value(config_key::mtu).toString(protocols::wireguard::defaultMtu);
+
+    jConfig[config_key::persistent_keep_alive] = 25;
+    QJsonArray allowedIps { "0.0.0.0/0", "::/0" };
+    jConfig[config_key::allowed_ips] = allowedIps;
+
+    jConfig[config_key::clientId] = connData.clientPubKey;
+
+    return QJsonDocument(jConfig).toJson();
 }

-void WireguardConfigurator::processConfigWithLocalSettings(const QPair<QString, QString> &dns,
-                                                           const bool isApiConfig, QSharedPointer<ProtocolConfig> &protocolConfig)
+QString WireguardConfigurator::processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
+                                                              QString &protocolConfigString)
 {
-    processConfigWithDnsSettings(dns, protocolConfig);
+    processConfigWithDnsSettings(dns, protocolConfigString);
+
+    return protocolConfigString;
 }

-void WireguardConfigurator::processConfigWithExportSettings(const QPair<QString, QString> &dns,
-                                                            const bool isApiConfig, QSharedPointer<ProtocolConfig> &protocolConfig)
+QString WireguardConfigurator::processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
+                                                               QString &protocolConfigString)
 {
-    processConfigWithDnsSettings(dns, protocolConfig);
+    processConfigWithDnsSettings(dns, protocolConfigString);
+
+    return protocolConfigString;
 }
--- a/client/configurators/wireguard_configurator.h
+++ b/client/configurators/wireguard_configurator.h
@@ -1,13 +1,10 @@
 #ifndef WIREGUARD_CONFIGURATOR_H
 #define WIREGUARD_CONFIGURATOR_H

-#include <QHostAddress>
 #include <QObject>
 #include <QProcessEnvironment>

 #include "configurator_base.h"
-#include "core/models/protocols/wireguardProtocolConfig.h"
-#include "core/models/protocols/awgProtocolConfig.h"
 #include "core/defs.h"
 #include "core/scripts_registry.h"

@@ -15,8 +12,8 @@ class WireguardConfigurator : public ConfiguratorBase
 {
    Q_OBJECT
 public:
-    WireguardConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController,
-                          bool isAwg, QObject *parent = nullptr);
+    WireguardConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, bool isAwg,
+                          QObject *parent = nullptr);

    struct ConnectionData
    {
@@ -29,23 +26,17 @@ public:
        QString port;
    };

-    QSharedPointer<ProtocolConfig> createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode) override;
+    QString createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
+                         ErrorCode &errorCode);

-    void processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                        QSharedPointer<ProtocolConfig> &protocolConfig) override;
-    void processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig,
-                                         QSharedPointer<ProtocolConfig> &protocolConfig) override;
-
-    Vars generateProtocolVars(const ServerCredentials &credentials, DockerContainer container,
-                             const QSharedPointer<ProtocolConfig> &protocolConfig) const override;
+    QString processConfigWithLocalSettings(const QPair<QString, QString> &dns, const bool isApiConfig, QString &protocolConfigString);
+    QString processConfigWithExportSettings(const QPair<QString, QString> &dns, const bool isApiConfig, QString &protocolConfigString);

    static ConnectionData genClientKeys();

 private:
-    QList<QHostAddress> getIpsFromConf(const QString &input);
    ConnectionData prepareWireguardConfig(const ServerCredentials &credentials, DockerContainer container,
-                                          const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode);
+                                          const QJsonObject &containerConfig, ErrorCode &errorCode);

    bool m_isAwg;
    QString m_serverConfigPath;
--- a/client/configurators/xray_configurator.cpp
+++ b/client/configurators/xray_configurator.cpp
@@ -3,198 +3,40 @@
 #include <QFile>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QUuid>
-#include "logger.h"

-#include "core/models/containers/containers_defs.h"
-#include "core/controllers/selfhosted/serverController.h"
+#include "containers/containers_defs.h"
+#include "core/controllers/serverController.h"
 #include "core/scripts_registry.h"
-#include "core/models/protocols/xrayProtocolConfig.h"
-#include "protocols/protocols_defs.h"
-
-namespace {
-Logger logger("XrayConfigurator");
-}

 XrayConfigurator::XrayConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent)
    : ConfiguratorBase(settings, serverController, parent)
 {
 }

-ConfiguratorBase::Vars XrayConfigurator::generateProtocolVars(const ServerCredentials &credentials, DockerContainer container,
-                                                              const QSharedPointer<ProtocolConfig> &protocolConfig) const
+QString XrayConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
+                                       ErrorCode &errorCode)
 {
-    Vars vars = generateCommonVars(credentials, container);
-
-    auto xrayConfig = qSharedPointerCast<XrayProtocolConfig>(protocolConfig);
-    if (!xrayConfig) {
-        return vars;
-    }
-
-    vars.append({{"$XRAY_SITE_NAME", xrayConfig->serverProtocolConfig.site}});
-    vars.append({{"$XRAY_SERVER_PORT", xrayConfig->serverProtocolConfig.port}});
-
-    return vars;
-}
-
-QString XrayConfigurator::prepareServerConfig(const ServerCredentials &credentials, DockerContainer container,
-                                               const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode)
-{
-    // Generate new UUID for client
-    QString clientId = QUuid::createUuid().toString(QUuid::WithoutBraces);
-    
-    // Get current server config
-    QString currentConfig = m_serverController->getTextFileFromContainer(
-        container, credentials, amnezia::protocols::xray::serverConfigPath, errorCode);
-    
-    if (errorCode != ErrorCode::NoError) {
-        logger.error() << "Failed to get server config file";
-        return "";
-    }
-
-    // Parse current config as JSON
-    QJsonDocument doc = QJsonDocument::fromJson(currentConfig.toUtf8());
-    if (doc.isNull() || !doc.isObject()) {
-        logger.error() << "Failed to parse server config JSON";
-        errorCode = ErrorCode::InternalError;
-        return "";
-    }
-
-    QJsonObject serverConfig = doc.object();
-    
-    if (!serverConfig.contains("inbounds")) {
-        logger.error() << "Server config missing 'inbounds' field";
-        errorCode = ErrorCode::InternalError;
-        return "";
-    }
-
-    QJsonArray inbounds = serverConfig["inbounds"].toArray();
-    if (inbounds.isEmpty()) {
-        logger.error() << "Server config has empty 'inbounds' array";
-        errorCode = ErrorCode::InternalError;
-        return "";
-    }
-    
-    QJsonObject inbound = inbounds[0].toObject();
-    if (!inbound.contains("settings")) {
-        logger.error() << "Inbound missing 'settings' field";
-        errorCode = ErrorCode::InternalError;
-        return "";
-    }
-
-    QJsonObject settings = inbound["settings"].toObject();
-    if (!settings.contains("clients")) {
-        logger.error() << "Settings missing 'clients' field";
-        errorCode = ErrorCode::InternalError;
-        return "";
-    }
-
-    QJsonArray clients = settings["clients"].toArray();
-    
-    // Create configuration for new client
-    QJsonObject clientConfig {
-        {"id", clientId},
-        {"flow", "xtls-rprx-vision"}
-    };
-    
-    clients.append(clientConfig);
-    
-    // Update config
-    settings["clients"] = clients;
-    inbound["settings"] = settings;
-    inbounds[0] = inbound;
-    serverConfig["inbounds"] = inbounds;
-    
-    // Save updated config to server
-    QString updatedConfig = QJsonDocument(serverConfig).toJson();
-    errorCode = m_serverController->uploadTextFileToContainer(
-        container, 
-        credentials, 
-        updatedConfig,
-        amnezia::protocols::xray::serverConfigPath,
-        libssh::ScpOverwriteMode::ScpOverwriteExisting
-    );
-    if (errorCode != ErrorCode::NoError) {
-        logger.error() << "Failed to upload updated config";
-        return "";
-    }
-
-    // Restart container
-    QString restartScript = QString("sudo docker restart $CONTAINER_NAME");
-    errorCode = m_serverController->runScript(
-        credentials, 
-        m_serverController->replaceVars(restartScript, generateProtocolVars(credentials, container))
-    );
-
-    if (errorCode != ErrorCode::NoError) {
-        logger.error() << "Failed to restart container";
-        return "";
-    }
-
-    return clientId;
-}
-
-QSharedPointer<ProtocolConfig> XrayConfigurator::createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                           const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode)
-{
-    auto xrayConfig = qSharedPointerCast<XrayProtocolConfig>(protocolConfig);
-    if (!xrayConfig) {
-        errorCode = ErrorCode::InternalError;
-        return nullptr;
-    }
-
-    // Get client ID from prepareServerConfig
-    QString xrayClientId = prepareServerConfig(credentials, container, protocolConfig, errorCode);
-    if (errorCode != ErrorCode::NoError || xrayClientId.isEmpty()) {
-        logger.error() << "Failed to prepare server config";
-        errorCode = ErrorCode::InternalError;
-        return nullptr;
-    }
-
    QString config = m_serverController->replaceVars(amnezia::scriptData(ProtocolScriptType::xray_template, container),
-                                                     generateProtocolVars(credentials, container, protocolConfig));
-    
-    if (config.isEmpty()) {
-        logger.error() << "Failed to get config template";
-        errorCode = ErrorCode::InternalError;
-        return nullptr;
-    }
+                                                     m_serverController->genVarsForScript(credentials, container, containerConfig));

    QString xrayPublicKey =
            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::xray::PublicKeyPath, errorCode);
-    if (errorCode != ErrorCode::NoError || xrayPublicKey.isEmpty()) {
-        logger.error() << "Failed to get public key";
-        errorCode = ErrorCode::InternalError;
-        return nullptr;
-    }
    xrayPublicKey.replace("\n", "");
-    
+
+    QString xrayUuid = m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::xray::uuidPath, errorCode);
+    xrayUuid.replace("\n", "");
+
    QString xrayShortId =
            m_serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::xray::shortidPath, errorCode);
-    if (errorCode != ErrorCode::NoError || xrayShortId.isEmpty()) {
-        logger.error() << "Failed to get short ID";
-        errorCode = ErrorCode::InternalError;
-        return nullptr;
-    }
    xrayShortId.replace("\n", "");

-    // Validate all required variables are present
-    if (!config.contains("$XRAY_CLIENT_ID") || !config.contains("$XRAY_PUBLIC_KEY") || !config.contains("$XRAY_SHORT_ID")) {
-        logger.error() << "Config template missing required variables:"
-                      << "XRAY_CLIENT_ID:" << !config.contains("$XRAY_CLIENT_ID")
-                      << "XRAY_PUBLIC_KEY:" << !config.contains("$XRAY_PUBLIC_KEY")
-                      << "XRAY_SHORT_ID:" << !config.contains("$XRAY_SHORT_ID");
-        errorCode = ErrorCode::InternalError;
-        return nullptr;
+    if (errorCode != ErrorCode::NoError) {
+        return "";
    }

-    config.replace("$XRAY_CLIENT_ID", xrayClientId);
+    config.replace("$XRAY_CLIENT_ID", xrayUuid);
    config.replace("$XRAY_PUBLIC_KEY", xrayPublicKey);
    config.replace("$XRAY_SHORT_ID", xrayShortId);

-    xrayConfig->clientProtocolConfig.isEmpty = false;
-    xrayConfig->clientProtocolConfig.clientId = xrayClientId;
-    xrayConfig->clientProtocolConfig.nativeConfig = config;
-
-    return xrayConfig;
+    return config;
 }
--- a/client/configurators/xray_configurator.h
+++ b/client/configurators/xray_configurator.h
@@ -4,7 +4,6 @@
 #include <QObject>

 #include "configurator_base.h"
-#include "core/models/protocols/xrayProtocolConfig.h"
 #include "core/defs.h"

 class XrayConfigurator : public ConfiguratorBase
@@ -13,15 +12,8 @@ class XrayConfigurator : public ConfiguratorBase
 public:
    XrayConfigurator(std::shared_ptr<Settings> settings, const QSharedPointer<ServerController> &serverController, QObject *parent = nullptr);

-    QSharedPointer<ProtocolConfig> createConfig(const ServerCredentials &credentials, DockerContainer container,
-                                                const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode) override;
-
-    Vars generateProtocolVars(const ServerCredentials &credentials, DockerContainer container,
-                             const QSharedPointer<ProtocolConfig> &protocolConfig) const override;
-
-private:
-    QString prepareServerConfig(const ServerCredentials &credentials, DockerContainer container,
-                                const QSharedPointer<ProtocolConfig> &protocolConfig, ErrorCode &errorCode);
+    QString createConfig(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig,
+                         ErrorCode &errorCode);
 };

 #endif // XRAY_CONFIGURATOR_H
--- a/client/core/models/containers/containers_defs.cpp
+++ b/client/core/models/containers/containers_defs.cpp
@@ -110,19 +110,22 @@ QMap<DockerContainer, QString> ContainerProps::containerDescriptions()
               QObject::tr("OpenVPN is the most popular VPN protocol, with flexible configuration options. It uses its "
                           "own security protocol with SSL/TLS for key exchange.") },
             { DockerContainer::ShadowSocks,
-               QObject::tr("Shadowsocks masks VPN traffic, making it resemble normal web traffic, but it may still be detected by certain analysis systems.") },
+               QObject::tr("Shadowsocks - masks VPN traffic, making it similar to normal web traffic, but it "
+                           "may be recognized by analysis systems in some highly censored regions.") },
             { DockerContainer::Cloak,
               QObject::tr("OpenVPN over Cloak - OpenVPN with VPN masquerading as web traffic and protection against "
-                           "active-probing detection. It is very resistant to detection, but offers low speed.") },
+                           "active-probing detection. Ideal for bypassing blocking in regions with the highest levels "
+                           "of censorship.") },
             { DockerContainer::WireGuard,
-               QObject::tr("WireGuard - popular VPN protocol with high performance, high speed and low power "
-                           "consumption.") },
+               QObject::tr("WireGuard - New popular VPN protocol with high performance, high speed and low power "
+                           "consumption. Recommended for regions with low levels of censorship.") },
             { DockerContainer::Awg,
-               QObject::tr("AmneziaWG is a special protocol from Amnezia based on WireGuard. "
-                           "It provides high connection speed and ensures stable operation even in the most challenging network conditions.") },
+               QObject::tr("AmneziaWG - Special protocol from Amnezia, based on WireGuard. It's fast like WireGuard, "
+                           "but very resistant to blockages. "
+                           "Recommended for regions with high levels of censorship.") },
             { DockerContainer::Xray,
-               QObject::tr("XRay with REALITY masks VPN traffic as web traffic and protects against active probing. "
-                           "It is highly resistant to detection and offers high speed.") },
+               QObject::tr("XRay with REALITY - Suitable for countries with the highest level of internet censorship. "
+                           "Traffic masking as web traffic at the TLS level, and protection against detection by active probing methods.") },
             { DockerContainer::Ipsec,
               QObject::tr("IKEv2/IPsec -  Modern stable protocol, a bit faster than others, restores connection after "
                           "signal loss. It has native support on the latest versions of Android and iOS.") },
@@ -140,83 +143,100 @@ QMap<DockerContainer, QString> ContainerProps::containerDetailedDescriptions()
 {
    return {
        { DockerContainer::OpenVpn,
-          QObject::tr("OpenVPN is one of the most popular and reliable VPN protocols. "
-                      "It uses SSL/TLS encryption, supports a wide variety of devices and operating systems, "
-                      "and is continuously improved by the community due to its open-source nature. "
-                      "It provides a good balance between speed and security but is easily recognized by DPI systems, "
-                      "making it susceptible to blocking.\n"
-                      "\nFeatures:\n"
-                      "* Available on all AmneziaVPN platforms\n"
-                      "* Normal battery consumption on mobile devices\n"
-                      "* Flexible customization for various devices and OS\n"
-                      "* Operates over both TCP and UDP protocols") },
+          QObject::tr(
+                      "OpenVPN stands as one of the most popular and time-tested VPN protocols available.\n"
+                      "It employs its unique security protocol, "
+                      "leveraging the strength of SSL/TLS for encryption and key exchange. "
+                      "Furthermore, OpenVPN's support for a multitude of authentication methods makes it versatile and adaptable, "
+                      "catering to a wide range of devices and operating systems. "
+                      "Due to its open-source nature, OpenVPN benefits from extensive scrutiny by the global community, "
+                      "which continually reinforces its security. "
+                      "With a strong balance of performance, security, and compatibility, "
+                      "OpenVPN remains a top choice for privacy-conscious individuals and businesses alike.\n\n"
+                      "* Available in the AmneziaVPN across all platforms\n"
+                      "* Normal power consumption on mobile devices\n"
+                      "* Flexible customisation to suit user needs to work with different operating systems and devices\n"
+                      "* Recognised by DPI analysis systems and therefore susceptible to blocking\n"
+                      "* Can operate over both TCP and UDP network protocols.") },
        { DockerContainer::ShadowSocks,
-          QObject::tr("Shadowsocks is based on the SOCKS5 protocol and encrypts connections using AEAD cipher. "
-                      "Although designed to be discreet, it doesn't mimic a standard HTTPS connection and can be detected by some DPI systems. "
-                      "Due to limited support in Amnezia, we recommend using the AmneziaWG protocol.\n"
-                      "\nFeatures:\n"
-                      "* Available in AmneziaVPN only on desktop platforms\n"
-                      "* Customizable encryption protocol\n"
+          QObject::tr("Shadowsocks, inspired by the SOCKS5 protocol, safeguards the connection using the AEAD cipher. "
+                      "Although Shadowsocks is designed to be discreet and challenging to identify, it isn't identical to a standard HTTPS connection."
+                      "However, certain traffic analysis systems might still detect a Shadowsocks connection. "
+                      "Due to limited support in Amnezia, it's recommended to use AmneziaWG protocol.\n\n"
+                      "* Available in the AmneziaVPN only on desktop platforms\n"
+                      "* Configurable encryption protocol\n"
                      "* Detectable by some DPI systems\n"
-                      "* Operates over TCP protocol\n") },
+                      "* Works over TCP network protocol.") },
        { DockerContainer::Cloak,
-          QObject::tr("This combination includes the OpenVPN protocol and the Cloak plugin, specifically designed to protect against blocking.\n"
-                      "\nOpenVPN securely encrypts all internet traffic between your device and the server.\n"
-                      "\nThe Cloak plugin further protects the connection from DPI detection. "
-                      "It modifies traffic metadata to disguise VPN traffic as regular web traffic and prevents detection through active probing. "
-                      "If an incoming connection fails authentication, Cloak serves a fake website, making your VPN invisible to traffic analysis systems.\n"
-                      "\nIn regions with heavy internet censorship, we strongly recommend using OpenVPN with Cloak from your first connection.\n"
-                      "\nFeatures:\n"
-                      "* Available on all AmneziaVPN platforms\n"
+          QObject::tr("This is a combination of the OpenVPN protocol and the Cloak plugin designed specifically for "
+                      "protecting against blocking.\n\n"
+                      "OpenVPN provides a secure VPN connection by encrypting all internet traffic between the client "
+                      "and the server.\n\n"
+                      "Cloak protects OpenVPN from detection and blocking. \n\n"
+                      "Cloak can modify packet metadata so that it completely masks VPN traffic as normal web traffic, "
+                      "and also protects the VPN from detection by Active Probing. This makes it very resistant to "
+                      "being detected\n\n"
+                      "Immediately after receiving the first data packet, Cloak authenticates the incoming connection. "
+                      "If authentication fails, the plugin masks the server as a fake website and your VPN becomes "
+                      "invisible to analysis systems.\n\n"
+                      "If there is a extreme level of Internet censorship in your region, we advise you to use only "
+                      "OpenVPN over Cloak from the first connection\n\n"
+                      "* Available in the AmneziaVPN across all platforms\n"
                      "* High power consumption on mobile devices\n"
-                      "* Flexible configuration options\n"
-                      "* Undetectable by DPI systems\n"
-                      "* Operates over TCP protocol on port 443") },
+                      "* Flexible settings\n"
+                      "* Not recognised by DPI analysis systems\n"
+                      "* Works over TCP network protocol, 443 port.\n") },
        { DockerContainer::WireGuard,
-          QObject::tr("WireGuard is a modern, streamlined VPN protocol offering stable connectivity and excellent performance across all devices. "
-                      "It uses fixed encryption settings, delivering lower latency and higher data transfer speeds compared to OpenVPN. "
-                      "However, WireGuard is easily identifiable by DPI systems due to its distinctive packet signatures, making it susceptible to blocking.\n"
-                      "\nFeatures:\n"
-                      "* Available on all AmneziaVPN platforms\n"
-                      "* Low power consumption on mobile devices\n"
-                      "* Minimal configuration required\n"
-                      "* Easily detected by DPI systems (susceptible to blocking)\n"
-                      "* Operates over UDP protocol") },
+          QObject::tr("A relatively new popular VPN protocol with a simplified architecture.\n"
+                      "WireGuard provides stable VPN connection and high performance on all devices. It uses hard-coded encryption "
+                      "settings. WireGuard compared to OpenVPN has lower latency and better data transfer throughput.\n"
+                      "WireGuard is very susceptible to blocking due to its distinct packet signatures. "
+                      "Unlike some other VPN protocols that employ obfuscation techniques, "
+                      "the consistent signature patterns of WireGuard packets can be more easily identified and "
+                      "thus blocked by advanced Deep Packet Inspection (DPI) systems and other network monitoring tools.\n\n"
+                      "* Available in the AmneziaVPN across all platforms\n"
+                      "* Low power consumption\n"
+                      "* Minimum number of settings\n"
+                      "* Easily recognised by DPI analysis systems, susceptible to blocking\n"
+                      "* Works over UDP network protocol.") },
        { DockerContainer::Awg,
-          QObject::tr("AmneziaWG is a modern VPN protocol based on WireGuard, "
-                      "combining simplified architecture with high performance across all devices. "
-                      "It addresses WireGuard's main vulnerability (easy detection by DPI systems) through advanced obfuscation techniques, "
-                      "making VPN traffic indistinguishable from regular internet traffic.\n"
-                      "\nAmneziaWG is an excellent choice for those seeking a fast, stealthy VPN connection.\n"
-                      "\nFeatures:\n"
-                      "* Available on all AmneziaVPN platforms\n"
-                      "* Low battery consumption on mobile devices\n"
-                      "* Minimal settings required\n"
-                      "* Undetectable by traffic analysis systems (DPI)\n"
-                      "* Operates over UDP protocol") },
+          QObject::tr("A modern iteration of the popular VPN protocol, "
+                      "AmneziaWG builds upon the foundation set by WireGuard, "
+                      "retaining its simplified architecture and high-performance capabilities across devices.\n"
+                      "While WireGuard is known for its efficiency, "
+                      "it had issues with being easily detected due to its distinct packet signatures. "
+                      "AmneziaWG solves this problem by using better obfuscation methods, "
+                      "making its traffic blend in with regular internet traffic.\n"
+                      "This means that AmneziaWG keeps the fast performance of the original "
+                      "while adding an extra layer of stealth, "
+                      "making it a great choice for those wanting a fast and discreet VPN connection.\n\n"
+                      "* Available in the AmneziaVPN across all platforms\n"
+                      "* Low power consumption\n"
+                      "* Minimum number of settings\n"
+                      "* Not recognised by DPI analysis systems, resistant to blocking\n"
+                      "* Works over UDP network protocol.") },
        { DockerContainer::Xray,
-          QObject::tr("REALITY is an innovative protocol developed by the creators of XRay, designed specifically to combat high levels of internet censorship. "
-                      "REALITY identifies censorship systems during the TLS handshake, "
-                      "redirecting suspicious traffic seamlessly to legitimate websites like google.com while providing genuine TLS certificates. "
-                      "This allows VPN traffic to blend indistinguishably with regular web traffic without special configuration."
-                      "\nUnlike older protocols such as VMess, VLESS, and XTLS-Vision, REALITY incorporates an advanced built-in \"friend-or-foe\" detection mechanism, "
-                      "effectively protecting against DPI and other traffic analysis methods.\n"
-                      "\nFeatures:\n"
-                      "* Resistant to active probing and DPI detection\n"
-                      "* No special configuration required to disguise traffic\n"
-                      "* Highly effective in heavily censored regions\n"
-                      "* Minimal battery consumption on devices\n"
-                      "* Operates over TCP protocol") },
+          QObject::tr("The REALITY protocol, a pioneering development by the creators of XRay, "
+                      "is specifically designed to counteract the highest levels of internet censorship through its novel approach to evasion.\n"
+                      "It uniquely identifies censors during the TLS handshake phase, seamlessly operating as a proxy for legitimate clients while diverting censors to genuine websites like google.com, "
+                      "thus presenting an authentic TLS certificate and data. \n"
+                      "This advanced capability differentiates REALITY from similar technologies by its ability to disguise web traffic as coming from random, "
+                      "legitimate sites without the need for specific configurations. \n"
+                      "Unlike older protocols such as VMess, VLESS, and the XTLS-Vision transport, "
+                      "REALITY's innovative \"friend or foe\" recognition at the TLS handshake enhances security and circumvents detection by sophisticated DPI systems employing active probing techniques. "
+                      "This makes REALITY a robust solution for maintaining internet freedom in environments with stringent censorship.")
+        },
        { DockerContainer::Ipsec,
-          QObject::tr("IKEv2, combined with IPSec encryption, is a modern and reliable VPN protocol. "
-                      "It reconnects quickly when switching networks or devices, making it ideal for dynamic network environments. "
-                      "While it provides good security and speed, it's easily recognized by DPI systems and susceptible to blocking.\n"
-                      "\nFeatures:\n"
-                      "* Available in AmneziaVPN only on Windows\n"
-                      "* Low battery consumption on mobile devices\n"
-                      "* Minimal configuration required\n"
-                      "* Detectable by DPI analysis systems(easily blocked)\n"
-                      "* Operates over UDP protocol(ports 500 and 4500)") },
+          QObject::tr("IKEv2, paired with the IPSec encryption layer, stands as a modern and stable VPN protocol.\n"
+                      "One of its distinguishing features is its ability to swiftly switch between networks and devices, "
+                      "making it particularly adaptive in dynamic network environments. \n"
+                      "While it offers a blend of security, stability, and speed, "
+                      "it's essential to note that IKEv2 can be easily detected and is susceptible to blocking.\n\n"
+                      "* Available in the AmneziaVPN only on Windows\n"
+                      "* Low power consumption, on mobile devices\n"
+                      "* Minimal configuration\n"
+                      "* Recognised by DPI analysis systems\n"
+                      "* Works over UDP network protocol, ports 500 and 4500.") },

        { DockerContainer::TorWebSite, QObject::tr("Website in Tor network") },
        { DockerContainer::Dns, QObject::tr("DNS Service") },
@@ -312,7 +332,9 @@ QStringList ContainerProps::fixedPortsForContainer(DockerContainer c)
 bool ContainerProps::isEasySetupContainer(DockerContainer container)
 {
    switch (container) {
+    case DockerContainer::WireGuard: return true;
    case DockerContainer::Awg: return true;
+    // case DockerContainer::Cloak: return true;
    default: return false;
    }
 }
@@ -320,7 +342,9 @@ bool ContainerProps::isEasySetupContainer(DockerContainer container)
 QString ContainerProps::easySetupHeader(DockerContainer container)
 {
    switch (container) {
-    case DockerContainer::Awg: return tr("Automatic");
+    case DockerContainer::WireGuard: return tr("Low");
+    case DockerContainer::Awg: return tr("High");
+    // case DockerContainer::Cloak: return tr("Extreme");
    default: return "";
    }
 }
@@ -328,8 +352,10 @@ QString ContainerProps::easySetupHeader(DockerContainer container)
 QString ContainerProps::easySetupDescription(DockerContainer container)
 {
    switch (container) {
-    case DockerContainer::Awg: return tr("AmneziaWG protocol will be installed. "
-                                         "It provides high connection speed and ensures stable operation even in the most challenging network conditions.");
+    case DockerContainer::WireGuard: return tr("I just want to increase the level of my privacy.");
+    case DockerContainer::Awg: return tr("I want to bypass censorship. This option recommended in most cases.");
+    // case DockerContainer::Cloak:
+    //     return tr("Most VPN protocols are blocked. Recommended if other options are not working.");
    default: return "";
    }
 }
@@ -337,7 +363,9 @@ QString ContainerProps::easySetupDescription(DockerContainer container)
 int ContainerProps::easySetupOrder(DockerContainer container)
 {
    switch (container) {
-    case DockerContainer::Awg: return 1;
+    case DockerContainer::WireGuard: return 3;
+    case DockerContainer::Awg: return 2;
+    // case DockerContainer::Cloak: return 1;
    default: return 0;
    }
 }
@@ -356,9 +384,9 @@ bool ContainerProps::isShareable(DockerContainer container)
 QJsonObject ContainerProps::getProtocolConfigFromContainer(const Proto protocol, const QJsonObject &containerConfig)
 {
    QString protocolConfigString = containerConfig.value(ProtocolProps::protoToString(protocol))
-    .toObject()
-            .value(config_key::last_config)
-            .toString();
+                                           .toObject()
+                                           .value(config_key::last_config)
+                                           .toString();

    return QJsonDocument::fromJson(protocolConfigString.toUtf8()).object();
 }
--- a/client/core/models/containers/containers_defs.h
+++ b/client/core/models/containers/containers_defs.h
--- a/client/core/api/apiDefs.h
+++ b/client/core/api/apiDefs.h
@@ -1,67 +0,0 @@
-#ifndef APIDEFS_H
-#define APIDEFS_H
-
-#include <QString>
-
-namespace apiDefs
-{
-    enum ConfigType {
-        AmneziaFreeV2 = 0,
-        AmneziaFreeV3,
-        AmneziaPremiumV1,
-        AmneziaPremiumV2,
-        SelfHosted,
-        ExternalPremium
-    };
-
-    namespace key
-    {
-        constexpr QLatin1String configVersion("config_version");
-        constexpr QLatin1String apiEndpoint("api_endpoint");
-        constexpr QLatin1String apiKey("api_key");
-        constexpr QLatin1String description("description");
-        constexpr QLatin1String name("name");
-        constexpr QLatin1String protocol("protocol");
-
-        constexpr QLatin1String apiConfig("api_config");
-        constexpr QLatin1String stackType("stack_type");
-        constexpr QLatin1String serviceType("service_type");
-        constexpr QLatin1String cliVersion("cli_version");
-        constexpr QLatin1String supportedProtocols("supported_protocols");
-
-        constexpr QLatin1String vpnKey("vpn_key");
-        constexpr QLatin1String config("config");
-        constexpr QLatin1String configs("configs");
-
-        constexpr QLatin1String installationUuid("installation_uuid");
-        constexpr QLatin1String workerLastUpdated("worker_last_updated");
-        constexpr QLatin1String lastDownloaded("last_downloaded");
-        constexpr QLatin1String sourceType("source_type");
-
-        constexpr QLatin1String serverCountryCode("server_country_code");
-        constexpr QLatin1String serverCountryName("server_country_name");
-
-        constexpr QLatin1String osVersion("os_version");
-
-        constexpr QLatin1String availableCountries("available_countries");
-        constexpr QLatin1String activeDeviceCount("active_device_count");
-        constexpr QLatin1String maxDeviceCount("max_device_count");
-        constexpr QLatin1String subscriptionEndDate("subscription_end_date");
-        constexpr QLatin1String issuedConfigs("issued_configs");
-
-        constexpr QLatin1String supportInfo("support_info");
-        constexpr QLatin1String email("email");
-        constexpr QLatin1String billingEmail("billing_email");
-        constexpr QLatin1String website("website");
-        constexpr QLatin1String websiteName("website_name");
-        constexpr QLatin1String telegram("telegram");
-
-        constexpr QLatin1String id("id");
-        constexpr QLatin1String orderId("order_id");
-        constexpr QLatin1String migrationCode("migration_code");
-    }
-
-    const int requestTimeoutMsecs = 12 * 1000; // 12 secs
-}
-
-#endif // APIDEFS_H
--- a/client/core/api/apiUtils.cpp
+++ b/client/core/api/apiUtils.cpp
@@ -1,164 +0,0 @@
-#include "apiUtils.h"
-
-#include <QDateTime>
-#include <QJsonObject>
-
-namespace
-{
-    const QByteArray AMNEZIA_CONFIG_SIGNATURE = QByteArray::fromHex("000000ff");
-
-    QString escapeUnicode(const QString &input)
-    {
-        QString output;
-        for (QChar c : input) {
-            if (c.unicode() < 0x20 || c.unicode() > 0x7E) {
-                output += QString("\\u%1").arg(QString::number(c.unicode(), 16).rightJustified(4, '0'));
-            } else {
-                output += c;
-            }
-        }
-        return output;
-    }
-}
-
-bool apiUtils::isSubscriptionExpired(const QString &subscriptionEndDate)
-{
-    QDateTime now = QDateTime::currentDateTime();
-    QDateTime endDate = QDateTime::fromString(subscriptionEndDate, Qt::ISODateWithMs);
-    return endDate < now;
-}
-
-bool apiUtils::isServerFromApi(const QJsonObject &serverConfigObject)
-{
-    auto configVersion = serverConfigObject.value(apiDefs::key::configVersion).toInt();
-    switch (configVersion) {
-    case amnezia::ServerConfigType::ApiV1: return true;
-    case amnezia::ServerConfigType::ApiV2: return true;
-    default: return false;
-    }
-}
-
-apiDefs::ConfigType apiUtils::getConfigType(const QJsonObject &serverConfigObject)
-{
-    auto configVersion = serverConfigObject.value(apiDefs::key::configVersion).toInt();
-
-    switch (configVersion) {
-    case amnezia::ServerConfigType::ApiV1: {
-        constexpr QLatin1String freeV2Endpoint(FREE_V2_ENDPOINT);
-        constexpr QLatin1String premiumV1Endpoint(PREM_V1_ENDPOINT);
-
-        auto apiEndpoint = serverConfigObject.value(apiDefs::key::apiEndpoint).toString();
-
-        if (apiEndpoint.contains(premiumV1Endpoint)) {
-            return apiDefs::ConfigType::AmneziaPremiumV1;
-        } else if (apiEndpoint.contains(freeV2Endpoint)) {
-            return apiDefs::ConfigType::AmneziaFreeV2;
-        }
-    };
-    case amnezia::ServerConfigType::ApiV2: {
-        constexpr QLatin1String servicePremium("amnezia-premium");
-        constexpr QLatin1String serviceFree("amnezia-free");
-        constexpr QLatin1String serviceExternalPremium("external-premium");
-
-        auto apiConfigObject = serverConfigObject.value(apiDefs::key::apiConfig).toObject();
-        auto serviceType = apiConfigObject.value(apiDefs::key::serviceType).toString();
-
-        if (serviceType == servicePremium) {
-            return apiDefs::ConfigType::AmneziaPremiumV2;
-        } else if (serviceType == serviceFree) {
-            return apiDefs::ConfigType::AmneziaFreeV3;
-        } else if (serviceType == serviceExternalPremium) {
-            return apiDefs::ConfigType::ExternalPremium;
-        }
-    }
-    default: {
-        return apiDefs::ConfigType::SelfHosted;
-    }
-    };
-}
-
-amnezia::ServerConfigType apiUtils::getConfigSource(const QJsonObject &serverConfigObject)
-{
-    return static_cast<amnezia::ServerConfigType>(serverConfigObject.value(apiDefs::key::configVersion).toInt());
-}
-
-amnezia::ErrorCode apiUtils::checkNetworkReplyErrors(const QList<QSslError> &sslErrors, QNetworkReply *reply)
-{
-    const int httpStatusCodeConflict = 409;
-    const int httpStatusCodeNotFound = 404;
-
-    if (!sslErrors.empty()) {
-        qDebug().noquote() << sslErrors;
-        return amnezia::ErrorCode::ApiConfigSslError;
-    } else if (reply->error() == QNetworkReply::NoError) {
-        return amnezia::ErrorCode::NoError;
-    } else if (reply->error() == QNetworkReply::NetworkError::OperationCanceledError
-               || reply->error() == QNetworkReply::NetworkError::TimeoutError) {
-        qDebug() << reply->error();
-        return amnezia::ErrorCode::ApiConfigTimeoutError;
-    } else if (reply->error() == QNetworkReply::NetworkError::OperationNotImplementedError) {
-        qDebug() << reply->error();
-        return amnezia::ErrorCode::ApiUpdateRequestError;
-    } else {
-        QString err = reply->errorString();
-        int httpStatusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-        qDebug() << QString::fromUtf8(reply->readAll());
-        qDebug() << reply->error();
-        qDebug() << err;
-        qDebug() << httpStatusCode;
-        if (httpStatusCode == httpStatusCodeConflict) {
-            return amnezia::ErrorCode::ApiConfigLimitError;
-        } else if (httpStatusCode == httpStatusCodeNotFound) {
-            return amnezia::ErrorCode::ApiNotFoundError;
-        }
-        return amnezia::ErrorCode::ApiConfigDownloadError;
-    }
-
-    qDebug() << "something went wrong";
-    return amnezia::ErrorCode::InternalError;
-}
-
-bool apiUtils::isPremiumServer(const QJsonObject &serverConfigObject)
-{
-    static const QSet<apiDefs::ConfigType> premiumTypes = { apiDefs::ConfigType::AmneziaPremiumV1, apiDefs::ConfigType::AmneziaPremiumV2,
-                                                            apiDefs::ConfigType::ExternalPremium };
-    return premiumTypes.contains(getConfigType(serverConfigObject));
-}
-
-QString apiUtils::getPremiumV1VpnKey(const QJsonObject &serverConfigObject)
-{
-    if (apiUtils::getConfigType(serverConfigObject) != apiDefs::ConfigType::AmneziaPremiumV1) {
-        return {};
-    }
-
-    QList<QPair<QString, QVariant>> orderedFields;
-    orderedFields.append(qMakePair(apiDefs::key::name, serverConfigObject[apiDefs::key::name].toString()));
-    orderedFields.append(qMakePair(apiDefs::key::description, serverConfigObject[apiDefs::key::description].toString()));
-    orderedFields.append(qMakePair(apiDefs::key::configVersion, serverConfigObject[apiDefs::key::configVersion].toDouble()));
-    orderedFields.append(qMakePair(apiDefs::key::protocol, serverConfigObject[apiDefs::key::protocol].toString()));
-    orderedFields.append(qMakePair(apiDefs::key::apiEndpoint, serverConfigObject[apiDefs::key::apiEndpoint].toString()));
-    orderedFields.append(qMakePair(apiDefs::key::apiKey, serverConfigObject[apiDefs::key::apiKey].toString()));
-
-    QString vpnKeyStr = "{";
-    for (int i = 0; i < orderedFields.size(); ++i) {
-        const auto &pair = orderedFields[i];
-        if (pair.second.typeId() == QMetaType::Type::QString) {
-            vpnKeyStr += "\"" + pair.first + "\": \"" + pair.second.toString() + "\"";
-        } else if (pair.second.typeId() == QMetaType::Type::Double || pair.second.typeId() == QMetaType::Type::Int) {
-            vpnKeyStr += "\"" + pair.first + "\": " + QString::number(pair.second.toDouble(), 'f', 1);
-        }
-
-        if (i < orderedFields.size() - 1) {
-            vpnKeyStr += ", ";
-        }
-    }
-    vpnKeyStr += "}";
-
-    QByteArray vpnKeyCompressed = escapeUnicode(vpnKeyStr).toUtf8();
-    vpnKeyCompressed = qCompress(vpnKeyCompressed, 6);
-    vpnKeyCompressed = vpnKeyCompressed.mid(4);
-
-    QByteArray signedData = AMNEZIA_CONFIG_SIGNATURE + vpnKeyCompressed;
-
-    return QString("vpn://%1").arg(QString(signedData.toBase64(QByteArray::Base64UrlEncoding)));
-}
--- a/client/core/api/apiUtils.h
+++ b/client/core/api/apiUtils.h
@@ -1,26 +0,0 @@
-#ifndef APIUTILS_H
-#define APIUTILS_H
-
-#include <QNetworkReply>
-#include <QObject>
-
-#include "apiDefs.h"
-#include "core/defs.h"
-
-namespace apiUtils
-{
-    bool isServerFromApi(const QJsonObject &serverConfigObject);
-
-    bool isSubscriptionExpired(const QString &subscriptionEndDate);
-
-    bool isPremiumServer(const QJsonObject &serverConfigObject);
-
-    apiDefs::ConfigType getConfigType(const QJsonObject &serverConfigObject);
-    amnezia::ServerConfigType getConfigSource(const QJsonObject &serverConfigObject);
-
-    amnezia::ErrorCode checkNetworkReplyErrors(const QList<QSslError> &sslErrors, QNetworkReply *reply);
-
-    QString getPremiumV1VpnKey(const QJsonObject &serverConfigObject);
-}
-
-#endif // APIUTILS_H
--- a/client/core/controllers/api/apiConfigController.cpp
+++ b/client/core/controllers/api/apiConfigController.cpp
@@ -1,684 +0,0 @@
-#include "apiConfigController.h"
-
-#include <QClipboard>
-#include <QEventLoop>
-
-#include "amnezia_application.h"
-#include "configurators/wireguard_configurator.h"
-#include "core/api/apiDefs.h"
-#include "core/api/apiUtils.h"
-#include "core/controllers/api/gatewayController.h"
-#include "core/qrCodeUtils.h"
-#include "core/utils/fileUtils.h"
-#include "core/models/servers/serverConfig.h"
-#include "core/models/servers/apiV2ServerConfig.h"
-#include "version.h"
-
-namespace
-{
-    namespace configKey
-    {
-        constexpr char cloak[] = "cloak";
-        constexpr char awg[] = "awg";
-        constexpr char vless[] = "vless";
-
-        constexpr char apiEndpoint[] = "api_endpoint";
-        constexpr char accessToken[] = "api_key";
-        constexpr char certificate[] = "certificate";
-        constexpr char publicKey[] = "public_key";
-        constexpr char protocol[] = "protocol";
-
-        constexpr char uuid[] = "installation_uuid";
-        constexpr char osVersion[] = "os_version";
-        constexpr char appVersion[] = "app_version";
-
-        constexpr char userCountryCode[] = "user_country_code";
-        constexpr char serverCountryCode[] = "server_country_code";
-        constexpr char serviceType[] = "service_type";
-        constexpr char serviceInfo[] = "service_info";
-        constexpr char serviceProtocol[] = "service_protocol";
-
-        constexpr char apiPayload[] = "api_payload";
-        constexpr char keyPayload[] = "key_payload";
-
-        constexpr char apiConfig[] = "api_config";
-        constexpr char authData[] = "auth_data";
-
-        constexpr char config[] = "config";
-    }
-
-    struct ProtocolData
-    {
-        OpenVpnConfigurator::ConnectionData certRequest;
-
-        QString wireGuardClientPrivKey;
-        QString wireGuardClientPubKey;
-
-        QString xrayUuid;
-    };
-
-    struct GatewayRequestData
-    {
-        QString osVersion;
-        QString appVersion;
-
-        QString installationUuid;
-
-        QString userCountryCode;
-        QString serverCountryCode;
-        QString serviceType;
-        QString serviceProtocol;
-
-        QJsonObject authData;
-
-        QJsonObject toJsonObject() const
-        {
-            QJsonObject obj;
-            if (!osVersion.isEmpty()) {
-                obj[configKey::osVersion] = osVersion;
-            }
-            if (!appVersion.isEmpty()) {
-                obj[configKey::appVersion] = appVersion;
-            }
-            if (!installationUuid.isEmpty()) {
-                obj[configKey::uuid] = installationUuid;
-            }
-            if (!userCountryCode.isEmpty()) {
-                obj[configKey::userCountryCode] = userCountryCode;
-            }
-            if (!serverCountryCode.isEmpty()) {
-                obj[configKey::serverCountryCode] = serverCountryCode;
-            }
-            if (!serviceType.isEmpty()) {
-                obj[configKey::serviceType] = serviceType;
-            }
-            if (!serviceProtocol.isEmpty()) {
-                obj[configKey::serviceProtocol] = serviceProtocol;
-            }
-            if (!authData.isEmpty()) {
-                obj[configKey::authData] = authData;
-            }
-            return obj;
-        }
-    };
-
-    ProtocolData generateProtocolData(const QString &protocol)
-    {
-        ProtocolData protocolData;
-        if (protocol == configKey::cloak) {
-            protocolData.certRequest = OpenVpnConfigurator::createCertRequest();
-        } else if (protocol == configKey::awg) {
-            auto connData = WireguardConfigurator::genClientKeys();
-            protocolData.wireGuardClientPubKey = connData.clientPubKey;
-            protocolData.wireGuardClientPrivKey = connData.clientPrivKey;
-        } else if (protocol == configKey::vless) {
-            protocolData.xrayUuid = QUuid::createUuid().toString(QUuid::WithoutBraces);
-        }
-
-        return protocolData;
-    }
-
-    void appendProtocolDataToApiPayload(const QString &protocol, const ProtocolData &protocolData, QJsonObject &apiPayload)
-    {
-        if (protocol == configKey::cloak) {
-            apiPayload[configKey::certificate] = protocolData.certRequest.request;
-        } else if (protocol == configKey::awg) {
-            apiPayload[configKey::publicKey] = protocolData.wireGuardClientPubKey;
-        } else if (protocol == configKey::vless) {
-            apiPayload[configKey::publicKey] = protocolData.xrayUuid;
-        }
-    }
-
-    ErrorCode fillServerConfig(const QString &protocol, const ProtocolData &apiPayloadData, const QByteArray &apiResponseBody,
-                               QSharedPointer<ServerConfig> &serverConfigPtr)
-    {
-        QJsonObject serverConfig;
-        QString data = QJsonDocument::fromJson(apiResponseBody).object().value(config_key::config).toString();
-
-        data.replace("vpn://", "");
-        QByteArray ba = QByteArray::fromBase64(data.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
-
-        if (ba.isEmpty()) {
-            qDebug() << "empty vpn key";
-            return ErrorCode::ApiConfigEmptyError;
-        }
-
-        QByteArray ba_uncompressed = qUncompress(ba);
-        if (!ba_uncompressed.isEmpty()) {
-            ba = ba_uncompressed;
-        }
-
-        QString configStr = ba;
-        if (protocol == configKey::cloak) {
-            configStr.replace("<key>", "<key>\n");
-            configStr.replace("$OPENVPN_PRIV_KEY", apiPayloadData.certRequest.privKey);
-        } else if (protocol == configKey::awg) {
-            configStr.replace("$WIREGUARD_CLIENT_PRIVATE_KEY", apiPayloadData.wireGuardClientPrivKey);
-            auto newServerConfig = QJsonDocument::fromJson(configStr.toUtf8()).object();
-            auto containers = newServerConfig.value(config_key::containers).toArray();
-            if (containers.isEmpty()) {
-                qDebug() << "missing containers field";
-                return ErrorCode::ApiConfigEmptyError;
-            }
-            auto container = containers.at(0).toObject();
-            QString containerName = ContainerProps::containerTypeToString(DockerContainer::Awg);
-            auto serverProtocolConfig = container.value(containerName).toObject();
-            auto clientProtocolConfig =
-                    QJsonDocument::fromJson(serverProtocolConfig.value(config_key::last_config).toString().toUtf8()).object();
-
-            //TODO looks like this block can be removed after v1 configs EOL
-
-            serverProtocolConfig[config_key::junkPacketCount] = clientProtocolConfig.value(config_key::junkPacketCount);
-            serverProtocolConfig[config_key::junkPacketMinSize] = clientProtocolConfig.value(config_key::junkPacketMinSize);
-            serverProtocolConfig[config_key::junkPacketMaxSize] = clientProtocolConfig.value(config_key::junkPacketMaxSize);
-            serverProtocolConfig[config_key::initPacketJunkSize] = clientProtocolConfig.value(config_key::initPacketJunkSize);
-            serverProtocolConfig[config_key::responsePacketJunkSize] = clientProtocolConfig.value(config_key::responsePacketJunkSize);
-            serverProtocolConfig[config_key::initPacketMagicHeader] = clientProtocolConfig.value(config_key::initPacketMagicHeader);
-            serverProtocolConfig[config_key::responsePacketMagicHeader] = clientProtocolConfig.value(config_key::responsePacketMagicHeader);
-            serverProtocolConfig[config_key::underloadPacketMagicHeader] = clientProtocolConfig.value(config_key::underloadPacketMagicHeader);
-            serverProtocolConfig[config_key::transportPacketMagicHeader] = clientProtocolConfig.value(config_key::transportPacketMagicHeader);
-
-            serverProtocolConfig[config_key::cookieReplyPacketJunkSize] = clientProtocolConfig.value(config_key::cookieReplyPacketJunkSize);
-            serverProtocolConfig[config_key::transportPacketJunkSize] = clientProtocolConfig.value(config_key::transportPacketJunkSize);
-            serverProtocolConfig[config_key::specialJunk1] = clientProtocolConfig.value(config_key::specialJunk1);
-            serverProtocolConfig[config_key::specialJunk2] = clientProtocolConfig.value(config_key::specialJunk2);
-            serverProtocolConfig[config_key::specialJunk3] = clientProtocolConfig.value(config_key::specialJunk3);
-            serverProtocolConfig[config_key::specialJunk4] = clientProtocolConfig.value(config_key::specialJunk4);
-            serverProtocolConfig[config_key::specialJunk5] = clientProtocolConfig.value(config_key::specialJunk5);
-            serverProtocolConfig[config_key::controlledJunk1] = clientProtocolConfig.value(config_key::controlledJunk1);
-            serverProtocolConfig[config_key::controlledJunk2] = clientProtocolConfig.value(config_key::controlledJunk2);
-            serverProtocolConfig[config_key::controlledJunk3] = clientProtocolConfig.value(config_key::controlledJunk3);
-            serverProtocolConfig[config_key::specialHandshakeTimeout] = clientProtocolConfig.value(config_key::specialHandshakeTimeout);
-
-            //
-
-            container[containerName] = serverProtocolConfig;
-            containers.replace(0, container);
-            newServerConfig[config_key::containers] = containers;
-            configStr = QString(QJsonDocument(newServerConfig).toJson());
-        }
-
-        QJsonObject newServerConfig = QJsonDocument::fromJson(configStr.toUtf8()).object();
-        serverConfig[config_key::dns1] = newServerConfig.value(config_key::dns1);
-        serverConfig[config_key::dns2] = newServerConfig.value(config_key::dns2);
-        serverConfig[config_key::containers] = newServerConfig.value(config_key::containers);
-        serverConfig[config_key::hostName] = newServerConfig.value(config_key::hostName);
-
-        if (newServerConfig.value(config_key::configVersion).toInt() == static_cast<int>(amnezia::ServerConfigType::ApiV2)) {
-            serverConfig[config_key::configVersion] = newServerConfig.value(config_key::configVersion);
-            serverConfig[config_key::description] = newServerConfig.value(config_key::description);
-            serverConfig[config_key::name] = newServerConfig.value(config_key::name);
-        }
-
-        auto defaultContainer = newServerConfig.value(config_key::defaultContainer).toString();
-        serverConfig[config_key::defaultContainer] = defaultContainer;
-
-        QVariantMap map = serverConfig.value(configKey::apiConfig).toObject().toVariantMap();
-        map.insert(newServerConfig.value(configKey::apiConfig).toObject().toVariantMap());
-        auto apiConfig = QJsonObject::fromVariantMap(map);
-
-        if (newServerConfig.value(config_key::configVersion).toInt() == static_cast<int>(amnezia::ServerConfigType::ApiV2)) {
-            apiConfig.insert(apiDefs::key::supportedProtocols,
-                             QJsonDocument::fromJson(apiResponseBody).object().value(apiDefs::key::supportedProtocols).toArray());
-        }
-
-        serverConfig[configKey::apiConfig] = apiConfig;
-
-        serverConfigPtr = ServerConfig::createServerConfig(serverConfig);
-        return ErrorCode::NoError;
-    }
-}
-
-ApiConfigsController::ApiConfigsController(const QSharedPointer<ServersModel> &serversModel,
-                                           const QSharedPointer<ApiServicesModel> &apiServicesModel,
-                                           const std::shared_ptr<Settings> &settings, QObject *parent)
-    : QObject(parent), m_serversModel(serversModel), m_apiServicesModel(apiServicesModel), m_settings(settings)
-{
-}
-
-ErrorCode ApiConfigsController::exportNativeConfig(const QString &serverCountryCode, const QString &fileName)
-{
-    if (fileName.isEmpty()) {
-        return ErrorCode::PermissionsError;
-    }
-
-    auto serverConfigPtr = m_serversModel->getServerConfig(m_serversModel->getProcessedServerIndex());
-    auto serverConfigObject = serverConfigPtr->toJson();
-    auto apiConfigObject = serverConfigObject.value(configKey::apiConfig).toObject();
-
-    GatewayRequestData gatewayRequestData { QSysInfo::productType(),
-                                            QString(APP_VERSION),
-                                            m_settings->getInstallationUuid(true),
-                                            apiConfigObject.value(configKey::userCountryCode).toString(),
-                                            serverCountryCode,
-                                            apiConfigObject.value(configKey::serviceType).toString(),
-                                            configKey::awg, // apiConfigObject.value(configKey::serviceProtocol).toString(),
-                                            serverConfigObject.value(configKey::authData).toObject() };
-
-    QString protocol = gatewayRequestData.serviceProtocol;
-    ProtocolData protocolData = generateProtocolData(protocol);
-
-    QJsonObject apiPayload = gatewayRequestData.toJsonObject();
-    appendProtocolDataToApiPayload(gatewayRequestData.serviceProtocol, protocolData, apiPayload);
-
-    QByteArray responseBody;
-    ErrorCode errorCode = executeRequest(QString("%1v1/native_config"), apiPayload, responseBody);
-    if (errorCode != ErrorCode::NoError) {
-        return errorCode;
-    }
-
-    QJsonObject jsonConfig = QJsonDocument::fromJson(responseBody).object();
-    QString nativeConfig = jsonConfig.value(configKey::config).toString();
-    nativeConfig.replace("$WIREGUARD_CLIENT_PRIVATE_KEY", protocolData.wireGuardClientPrivKey);
-
-    FileUtils::saveFile(fileName, nativeConfig);
-    return ErrorCode::NoError;
-}
-
-ErrorCode ApiConfigsController::revokeNativeConfig(const QString &serverCountryCode)
-{
-    auto serverConfigPtr = m_serversModel->getServerConfig(m_serversModel->getProcessedServerIndex());
-    auto serverConfigObject = serverConfigPtr->toJson();
-    auto apiConfigObject = serverConfigObject.value(configKey::apiConfig).toObject();
-
-    GatewayRequestData gatewayRequestData { QSysInfo::productType(),
-                                            QString(APP_VERSION),
-                                            m_settings->getInstallationUuid(true),
-                                            apiConfigObject.value(configKey::userCountryCode).toString(),
-                                            serverCountryCode,
-                                            apiConfigObject.value(configKey::serviceType).toString(),
-                                            configKey::awg, // apiConfigObject.value(configKey::serviceProtocol).toString(),
-                                            serverConfigObject.value(configKey::authData).toObject() };
-
-    QJsonObject apiPayload = gatewayRequestData.toJsonObject();
-
-    QByteArray responseBody;
-    ErrorCode errorCode = executeRequest(QString("%1v1/revoke_native_config"), apiPayload, responseBody);
-    if (errorCode != ErrorCode::NoError && errorCode != ErrorCode::ApiNotFoundError) {
-        return errorCode;
-    }
-    return ErrorCode::NoError;
-}
-
-void ApiConfigsController::prepareVpnKeyExport()
-{
-    auto serverConfigPtr = m_serversModel->getServerConfig(m_serversModel->getProcessedServerIndex());
-    auto serverConfigObject = serverConfigPtr->toJson();
-    auto apiConfigObject = serverConfigObject.value(configKey::apiConfig).toObject();
-
-    auto vpnKey = apiConfigObject.value(apiDefs::key::vpnKey).toString();
-    m_vpnKey = vpnKey;
-
-    vpnKey.replace("vpn://", "");
-
-    m_qrCodes = qrCodeUtils::generateQrCodeImageSeries(vpnKey.toUtf8());
-
-    
-}
-
-void ApiConfigsController::copyVpnKeyToClipboard()
-{
-    auto clipboard = amnApp->getClipboard();
-    clipboard->setText(m_vpnKey);
-}
-
-ErrorCode ApiConfigsController::fillAvailableServices()
-{
-    QJsonObject apiPayload;
-    apiPayload[configKey::osVersion] = QSysInfo::productType();
-
-    QByteArray responseBody;
-    ErrorCode errorCode = executeRequest(QString("%1v1/services"), apiPayload, responseBody);
-    if (errorCode == ErrorCode::NoError) {
-        if (!responseBody.contains("services")) {
-            errorCode = ErrorCode::ApiServicesMissingError;
-        }
-    }
-
-    if (errorCode != ErrorCode::NoError) {
-        return errorCode;
-    }
-
-    QJsonObject data = QJsonDocument::fromJson(responseBody).object();
-    m_apiServicesModel->updateModel(data);
-    return ErrorCode::NoError;
-}
-
-bool ApiConfigsController::isServerFromApiAlreadyExists(const QString &userCountryCode,
-                                                       const QString &serviceType,
-                                                       const QString &serviceProtocol) const
-{
-    auto servers = m_settings->serversArray();
-    for (const auto &server : servers) {
-        auto serverConfig = ServerConfig::createServerConfig(server.toObject());
-        if (serverConfig->type != amnezia::ServerConfigType::ApiV2) continue;
-        auto apiV2Config = qSharedPointerCast<ApiV2ServerConfig>(serverConfig);
-        if (!apiV2Config) continue;
-
-        if (apiV2Config->apiConfig.userCountryCode == userCountryCode &&
-            apiV2Config->apiConfig.serviceType == serviceType &&
-            apiV2Config->apiConfig.serviceProtocol == serviceProtocol) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool ApiConfigsController::isApiKeyExpired(int serverIndex) const
-{
-    auto servers = m_settings->serversArray();
-    if (serverIndex >= servers.size()) return false;
-
-    auto serverConfig = ServerConfig::createServerConfig(servers.at(serverIndex).toObject());
-    if (serverConfig->type != amnezia::ServerConfigType::ApiV2) return false;
-
-    auto apiV2Config = qSharedPointerCast<ApiV2ServerConfig>(serverConfig);
-    if (!apiV2Config) return false;
-
-    QString expiresIso = apiV2Config->apiConfig.publicKey.expiresAt;
-    if (expiresIso.isEmpty()) {
-        expiresIso = apiV2Config->apiConfig.subscription.end_date;
-    }
-    if (expiresIso.isEmpty()) return false;
-
-    auto expiresAt = QDateTime::fromString(expiresIso, Qt::ISODate);
-    return QDateTime::currentDateTime() > expiresAt;
-}
-
-void ApiConfigsController::removeApiConfig(int serverIndex)
-{
-    auto servers = m_settings->serversArray();
-    if (serverIndex >= servers.size()) return;
-
-    auto serverConfig = ServerConfig::createServerConfig(servers.at(serverIndex).toObject());
-    if (serverConfig->type != amnezia::ServerConfigType::ApiV2) return;
-
-    auto apiV2 = qSharedPointerCast<ApiV2ServerConfig>(serverConfig);
-    if (!apiV2) return;
-
-    apiV2->containerConfigs.clear();
-    apiV2->apiConfig.publicKey.expiresAt.clear();
-    apiV2->apiConfig.vpnKey.clear();
-    apiV2->defaultContainer = ContainerProps::containerToString(DockerContainer::None);
-
-    m_serversModel->editServer(apiV2, serverIndex);
-}
-
-ErrorCode ApiConfigsController::importServiceFromGateway()
-{
-    GatewayRequestData gatewayRequestData { QSysInfo::productType(),
-                                            QString(APP_VERSION),
-                                            m_settings->getInstallationUuid(true),
-                                            m_apiServicesModel->getCountryCode(),
-                                            "",
-                                            m_apiServicesModel->getSelectedServiceType(),
-                                            m_apiServicesModel->getSelectedServiceProtocol(),
-                                            QJsonObject() };
-
-    if (isServerFromApiAlreadyExists(gatewayRequestData.userCountryCode, gatewayRequestData.serviceType,
-                                     gatewayRequestData.serviceProtocol)) {
-        return ErrorCode::ApiConfigAlreadyAdded;
-    }
-
-    ProtocolData protocolData = generateProtocolData(gatewayRequestData.serviceProtocol);
-
-    QJsonObject apiPayload = gatewayRequestData.toJsonObject();
-    appendProtocolDataToApiPayload(gatewayRequestData.serviceProtocol, protocolData, apiPayload);
-
-    QByteArray responseBody;
-    ErrorCode errorCode = executeRequest(QString("%1v1/config"), apiPayload, responseBody);
-
-    QSharedPointer<ServerConfig> serverConfigPtr;
-    if (errorCode == ErrorCode::NoError) {
-        errorCode = fillServerConfig(gatewayRequestData.serviceProtocol, protocolData, responseBody, serverConfigPtr);
-        if (errorCode != ErrorCode::NoError) {
-            return errorCode;
-        }
-        if (serverConfigPtr->type == amnezia::ServerConfigType::ApiV2) {
-            auto apiV2ServerConfig = qSharedPointerCast<ApiV2ServerConfig>(serverConfigPtr);
-            apiV2ServerConfig->apiConfig.userCountryCode = m_apiServicesModel->getCountryCode();
-            apiV2ServerConfig->apiConfig.serviceType = m_apiServicesModel->getSelectedServiceType();
-            apiV2ServerConfig->apiConfig.serviceProtocol = m_apiServicesModel->getSelectedServiceProtocol();
-        }
-        m_serversModel->addServer(serverConfigPtr);
-        return ErrorCode::NoError;
-    } else {
-        return errorCode;
-    }
-}
-
-ErrorCode ApiConfigsController::updateServiceFromGateway(const int serverIndex, const QString &newCountryCode, const QString &newCountryName,
-                                                    bool reloadServiceConfig)
-{
-    auto serverConfigPtr = m_serversModel->getServerConfig(serverIndex);
-    auto serverConfigJson = serverConfigPtr->toJson();
-    auto apiConfig = serverConfigJson.value(configKey::apiConfig).toObject();
-
-    GatewayRequestData gatewayRequestData { QSysInfo::productType(),
-                                            QString(APP_VERSION),
-                                            m_settings->getInstallationUuid(true),
-                                            apiConfig.value(configKey::userCountryCode).toString(),
-        newCountryCode,
-                                            apiConfig.value(configKey::serviceType).toString(),
-                                            apiConfig.value(configKey::serviceProtocol).toString(),
-                                            serverConfigJson.value(configKey::authData).toObject() };
-
-    ProtocolData protocolData = generateProtocolData(gatewayRequestData.serviceProtocol);
-
-    QJsonObject apiPayload = gatewayRequestData.toJsonObject();
-    appendProtocolDataToApiPayload(gatewayRequestData.serviceProtocol, protocolData, apiPayload);
-
-    QByteArray responseBody;
-    ErrorCode errorCode = executeRequest(QString("%1v1/config"), apiPayload, responseBody);
-
-    QSharedPointer<ServerConfig> newServerConfigPtr;
-    if (errorCode == ErrorCode::NoError) {
-        errorCode = fillServerConfig(gatewayRequestData.serviceProtocol, protocolData, responseBody, newServerConfigPtr);
-        if (errorCode != ErrorCode::NoError) {
-            return errorCode;
-        }
-        if (newServerConfigPtr->type == amnezia::ServerConfigType::ApiV2 && serverConfigPtr->type == amnezia::ServerConfigType::ApiV2) {
-            auto newApiV2 = qSharedPointerCast<ApiV2ServerConfig>(newServerConfigPtr);
-            auto oldApiV2 = qSharedPointerCast<ApiV2ServerConfig>(serverConfigPtr);
-            newApiV2->apiConfig.userCountryCode = oldApiV2->apiConfig.userCountryCode;
-            newApiV2->apiConfig.serviceType = oldApiV2->apiConfig.serviceType;
-            newApiV2->apiConfig.serviceProtocol = oldApiV2->apiConfig.serviceProtocol;
-            newApiV2->apiConfig.vpnKey = oldApiV2->apiConfig.vpnKey;
-            newApiV2->apiConfig.authData.apiKey = gatewayRequestData.authData.value("api_key").toString();
-            if (serverConfigPtr->nameOverriddenByUser) {
-                newApiV2->name = oldApiV2->name;
-                newApiV2->nameOverriddenByUser = true;
-            }
-        }
-        m_serversModel->editServer(newServerConfigPtr, serverIndex);
-        return ErrorCode::NoError;
-    } else {
-        return errorCode;
-    }
-}
-
-ErrorCode ApiConfigsController::updateServiceFromTelegram(const int serverIndex)
-{
-#ifdef Q_OS_IOS
-    IosController::Instance()->requestInetAccess();
-    QThread::msleep(10);
-#endif
-
-    GatewayController gatewayController(m_settings->getGatewayEndpoint(), m_settings->isDevGatewayEnv(), apiDefs::requestTimeoutMsecs,
-                                        m_settings->isStrictKillSwitchEnabled());
-
-    auto serverConfigPtr = m_serversModel->getServerConfig(serverIndex);
-    auto installationUuid = m_settings->getInstallationUuid(true);
-
-    auto serverConfigJson2 = serverConfigPtr->toJson();
-    QString serviceProtocol = serverConfigJson2.value(configKey::protocol).toString();
-    ProtocolData protocolData = generateProtocolData(serviceProtocol);
-
-    QJsonObject apiPayload;
-    appendProtocolDataToApiPayload(serviceProtocol, protocolData, apiPayload);
-    apiPayload[configKey::uuid] = installationUuid;
-    apiPayload[configKey::osVersion] = QSysInfo::productType();
-    apiPayload[configKey::appVersion] = QString(APP_VERSION);
-    apiPayload[configKey::accessToken] = serverConfigJson2.value(configKey::accessToken).toString();
-    apiPayload[configKey::apiEndpoint] = serverConfigJson2.value(configKey::apiEndpoint).toString();
-
-    QByteArray responseBody;
-    ErrorCode errorCode = gatewayController.post(QString("%1v1/proxy_config"), apiPayload, responseBody);
-
-    if (errorCode == ErrorCode::NoError) {
-        QSharedPointer<ServerConfig> updatedConfigPtr;
-        errorCode = fillServerConfig(serviceProtocol, protocolData, responseBody, updatedConfigPtr);
-        if (errorCode != ErrorCode::NoError) {
-            return errorCode;
-        }
-        m_serversModel->editServer(updatedConfigPtr, serverIndex);
-        return ErrorCode::NoError;
-    } else {
-        return errorCode;
-    }
-}
-
-ErrorCode ApiConfigsController::deactivateDevice()
-{
-    auto serverIndex = m_serversModel->getProcessedServerIndex();
-    auto serverConfigPtr = m_serversModel->getServerConfig(serverIndex);
-    auto serverConfigObject = serverConfigPtr->toJson();
-    auto apiConfigObject = serverConfigObject.value(configKey::apiConfig).toObject();
-
-    if (!apiUtils::isPremiumServer(serverConfigObject)) {
-        return ErrorCode::NoError;
-    }
-
-    GatewayRequestData gatewayRequestData { QSysInfo::productType(),
-                                            QString(APP_VERSION),
-                                            m_settings->getInstallationUuid(true),
-                                            apiConfigObject.value(configKey::userCountryCode).toString(),
-                                            apiConfigObject.value(configKey::serverCountryCode).toString(),
-                                            apiConfigObject.value(configKey::serviceType).toString(),
-                                            "",
-                                            serverConfigObject.value(configKey::authData).toObject() };
-
-    QJsonObject apiPayload = gatewayRequestData.toJsonObject();
-
-    QByteArray responseBody;
-    ErrorCode errorCode = executeRequest(QString("%1v1/revoke_config"), apiPayload, responseBody);
-    if (errorCode != ErrorCode::NoError && errorCode != ErrorCode::ApiNotFoundError) {
-        return errorCode;
-    }
-
-    serverConfigPtr->containerConfigs.clear();
-    m_serversModel->editServer(serverConfigPtr, serverIndex);
-
-    return ErrorCode::NoError;
-}
-
-ErrorCode ApiConfigsController::deactivateExternalDevice(const QString &uuid, const QString &serverCountryCode)
-{
-    auto serverIndex = m_serversModel->getProcessedServerIndex();
-    auto serverConfigPtr = m_serversModel->getServerConfig(serverIndex);
-    auto serverConfigObject = serverConfigPtr->toJson();
-    auto apiConfigObject = serverConfigObject.value(configKey::apiConfig).toObject();
-
-    if (!apiUtils::isPremiumServer(serverConfigObject)) {
-        return ErrorCode::NoError;
-    }
-
-    GatewayRequestData gatewayRequestData { QSysInfo::productType(),
-                                            QString(APP_VERSION),
-                                            uuid,
-                                            apiConfigObject.value(configKey::userCountryCode).toString(),
-                                            serverCountryCode,
-                                            apiConfigObject.value(configKey::serviceType).toString(),
-                                            "",
-                                            serverConfigObject.value(configKey::authData).toObject() };
-
-    QJsonObject apiPayload = gatewayRequestData.toJsonObject();
-
-    QByteArray responseBody;
-    ErrorCode errorCode = executeRequest(QString("%1v1/revoke_config"), apiPayload, responseBody);
-    if (errorCode != ErrorCode::NoError && errorCode != ErrorCode::ApiNotFoundError) {
-        return errorCode;
-    }
-
-    if (uuid == m_settings->getInstallationUuid(true)) {
-        serverConfigPtr->containerConfigs.clear();
-        m_serversModel->editServer(serverConfigPtr, serverIndex);
-    }
-
-    return ErrorCode::NoError;
-}
-
-bool ApiConfigsController::isConfigValid()
-{
-    int serverIndex = m_serversModel->getDefaultServerIndex();
-    auto serverConfigPtr = m_serversModel->getServerConfig(serverIndex);
-    QJsonObject serverConfigObject = serverConfigPtr->toJson();
-    auto configSource = apiUtils::getConfigSource(serverConfigObject);
-
-    if (configSource == amnezia::ServerConfigType::ApiV1
-        && !m_serversModel->data(serverIndex, ServersModel::Roles::HasInstalledContainers).toBool()) {
-        removeApiConfig(serverIndex);
-        return updateServiceFromTelegram(serverIndex);
-    } else if (configSource == amnezia::ServerConfigType::ApiV2
-               && !m_serversModel->data(serverIndex, ServersModel::Roles::HasInstalledContainers).toBool()) {
-        return updateServiceFromGateway(serverIndex, "", "");
-    } else if (configSource && isApiKeyExpired(serverIndex)) {
-        qDebug() << "attempt to update api config by expires_at event";
-        if (configSource == amnezia::ServerConfigType::ApiV2) {
-            return updateServiceFromGateway(serverIndex, "", "");
-        } else {
-            removeApiConfig(serverIndex);
-            return updateServiceFromTelegram(serverIndex);
-        }
-    }
-    return true;
-}
-
-void ApiConfigsController::setCurrentProtocol(const QString &protocolName)
-{
-    auto serverIndex = m_serversModel->getProcessedServerIndex();
-    auto serverConfigPtr = m_serversModel->getServerConfig(serverIndex);
-    auto serverConfigObject = serverConfigPtr->toJson();
-    auto apiConfigObject = serverConfigObject.value(configKey::apiConfig).toObject();
-
-    apiConfigObject[configKey::serviceProtocol] = protocolName;
-
-    serverConfigObject.insert(configKey::apiConfig, apiConfigObject);
-
-    auto updatedPtr = ServerConfig::createServerConfig(serverConfigObject);
-    m_serversModel->editServer(updatedPtr, serverIndex);
-}
-
-bool ApiConfigsController::isVlessProtocol()
-{
-    auto serverIndex = m_serversModel->getProcessedServerIndex();
-    auto serverConfigObject = m_serversModel->getServerConfig(serverIndex);
-    auto apiConfigObject = serverConfigObject.value(configKey::apiConfig).toObject();
-
-    if (apiConfigObject[configKey::serviceProtocol].toString() == "vless") {
-        return true;
-    }
-    return false;
-}
-
-QList<QString> ApiConfigsController::getQrCodes()
-{
-    return m_qrCodes;
-}
-
-int ApiConfigsController::getQrCodesCount()
-{
-    return m_qrCodes.size();
-}
-
-QString ApiConfigsController::getVpnKey()
-{
-    return m_vpnKey;
-}
-
-ErrorCode ApiConfigsController::executeRequest(const QString &endpoint, const QJsonObject &apiPayload, QByteArray &responseBody)
-{
-    GatewayController gatewayController(m_settings->getGatewayEndpoint(), m_settings->isDevGatewayEnv(), apiDefs::requestTimeoutMsecs,
-                                        m_settings->isStrictKillSwitchEnabled());
-    return gatewayController.post(endpoint, apiPayload, responseBody);
-}
--- a/client/core/controllers/api/apiConfigController.h
+++ b/client/core/controllers/api/apiConfigController.h
@@ -1,57 +0,0 @@
-#ifndef APICONFIGSCONTROLLER_H
-#define APICONFIGSCONTROLLER_H
-
-#include <QObject>
-
-#include "configurators/openvpn_configurator.h"
-#include "ui/models/api/apiServicesModel.h"
-#include "ui/models/servers_model.h"
-
-class ApiConfigsController : public QObject
-{
-    Q_OBJECT
-public:
-    ApiConfigsController(const QSharedPointer<ServersModel> &serversModel, const QSharedPointer<ApiServicesModel> &apiServicesModel,
-                         const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);
-
-    QList<QString> getQrCodes();
-    int getQrCodesCount();
-    QString getVpnKey();
-
-public slots:
-    ErrorCode exportNativeConfig(const QString &serverCountryCode, const QString &fileName);
-    ErrorCode revokeNativeConfig(const QString &serverCountryCode);
-    void prepareVpnKeyExport();
-    void copyVpnKeyToClipboard();
-
-    ErrorCode fillAvailableServices();
-    ErrorCode importServiceFromGateway();
-    ErrorCode updateServiceFromGateway(const int serverIndex, const QString &newCountryCode, const QString &newCountryName,
-                                       bool reloadServiceConfig = false);
-    ErrorCode updateServiceFromTelegram(const int serverIndex);
-    ErrorCode deactivateDevice();
-    ErrorCode deactivateExternalDevice(const QString &uuid, const QString &serverCountryCode);
-
-    bool isConfigValid();
-
-    void setCurrentProtocol(const QString &protocolName);
-    bool isVlessProtocol();
-
-private:
-    ErrorCode executeRequest(const QString &endpoint, const QJsonObject &apiPayload, QByteArray &responseBody);
-
-      bool isServerFromApiAlreadyExists(const QString &userCountryCode,
-                                        const QString &serviceType,
-                                        const QString &serviceProtocol) const;
-      bool isApiKeyExpired(int serverIndex) const;
-      void removeApiConfig(int serverIndex);
-
-    QList<QString> m_qrCodes;
-    QString m_vpnKey;
-
-    QSharedPointer<ServersModel> m_serversModel;
-    QSharedPointer<ApiServicesModel> m_apiServicesModel;
-    std::shared_ptr<Settings> m_settings;
-};
-
-#endif // APICONFIGSCONTROLLER_H
--- a/client/core/controllers/api/apiPremV1MigrationController.cpp
+++ b/client/core/controllers/api/apiPremV1MigrationController.cpp
@@ -1,134 +0,0 @@
-#include "apiPremV1MigrationController.h"
-
-#include <QEventLoop>
-#include <QTimer>
-
-#include "core/api/apiDefs.h"
-#include "core/api/apiUtils.h"
-#include "core/controllers/api/gatewayController.h"
-
-ApiPremV1MigrationController::ApiPremV1MigrationController(const QSharedPointer<ServersModel> &serversModel,
-                                                           const std::shared_ptr<Settings> &settings, QObject *parent)
-    : QObject(parent), m_serversModel(serversModel), m_settings(settings)
-{
-}
-
-bool ApiPremV1MigrationController::hasConfigsToMigration()
-{
-    QJsonArray vpnKeys;
-
-    auto serversCount = m_serversModel->getServersCount();
-    for (size_t i = 0; i < serversCount; i++) {
-        auto serverConfigPtr = m_serversModel->getServerConfig(i);
-        auto serverConfigObject = serverConfigPtr->toJson();
-
-        if (apiUtils::getConfigType(serverConfigObject) != apiDefs::ConfigType::AmneziaPremiumV1) {
-            continue;
-        }
-
-        QString vpnKey = apiUtils::getPremiumV1VpnKey(serverConfigObject);
-        vpnKeys.append(vpnKey);
-    }
-
-    if (!vpnKeys.isEmpty()) {
-        GatewayController gatewayController(m_settings->getGatewayEndpoint(), m_settings->isDevGatewayEnv(), apiDefs::requestTimeoutMsecs,
-                                            m_settings->isStrictKillSwitchEnabled());
-        QJsonObject apiPayload;
-
-        apiPayload["configs"] = vpnKeys;
-        QByteArray responseBody;
-        ErrorCode errorCode = gatewayController.post(QString("%1v1/prem-v1/is-active-subscription"), apiPayload, responseBody);
-
-        auto migrationsStatus = QJsonDocument::fromJson(responseBody).object();
-        for (const auto &migrationStatus : migrationsStatus) {
-            if (migrationStatus == "not_found") {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-void ApiPremV1MigrationController::getSubscriptionList(const QString &email)
-{
-    GatewayController gatewayController(m_settings->getGatewayEndpoint(), m_settings->isDevGatewayEnv(), apiDefs::requestTimeoutMsecs,
-                                        m_settings->isStrictKillSwitchEnabled());
-    QJsonObject apiPayload;
-
-    apiPayload[apiDefs::key::email] = email;
-    QByteArray responseBody;
-    ErrorCode errorCode = gatewayController.post(QString("%1v1/prem-v1/subscription-list"), apiPayload, responseBody);
-
-    if (errorCode == ErrorCode::NoError) {
-        m_email = email;
-        m_subscriptionsModel = QJsonDocument::fromJson(responseBody).array();
-        if (m_subscriptionsModel.isEmpty()) {
-            emit noSubscriptionToMigrate();
-            return;
-        }
-
-        emit subscriptionsModelChanged();
-    } else {
-        emit errorOccurred(ErrorCode::ApiMigrationError);
-    }
-}
-
-QJsonArray ApiPremV1MigrationController::getSubscriptionModel()
-{
-    return m_subscriptionsModel;
-}
-
-void ApiPremV1MigrationController::sendMigrationCode(const int subscriptionIndex)
-{
-    QEventLoop wait;
-    QTimer::singleShot(1000, &wait, &QEventLoop::quit);
-    wait.exec();
-
-    GatewayController gatewayController(m_settings->getGatewayEndpoint(), m_settings->isDevGatewayEnv(), apiDefs::requestTimeoutMsecs,
-                                        m_settings->isStrictKillSwitchEnabled());
-    QJsonObject apiPayload;
-
-    apiPayload[apiDefs::key::email] = m_email;
-    QByteArray responseBody;
-    ErrorCode errorCode = gatewayController.post(QString("%1v1/prem-v1/migration-code"), apiPayload, responseBody);
-
-    if (errorCode == ErrorCode::NoError) {
-        m_subscriptionIndex = subscriptionIndex;
-        emit otpSuccessfullySent();
-    } else {
-        emit errorOccurred(ErrorCode::ApiMigrationError);
-    }
-}
-
-void ApiPremV1MigrationController::migrate(const QString &migrationCode)
-{
-    GatewayController gatewayController(m_settings->getGatewayEndpoint(), m_settings->isDevGatewayEnv(), apiDefs::requestTimeoutMsecs,
-                                        m_settings->isStrictKillSwitchEnabled());
-    QJsonObject apiPayload;
-
-    apiPayload[apiDefs::key::email] = m_email;
-    apiPayload[apiDefs::key::orderId] = m_subscriptionsModel.at(m_subscriptionIndex).toObject().value(apiDefs::key::id).toString();
-    apiPayload[apiDefs::key::migrationCode] = migrationCode;
-    QByteArray responseBody;
-    ErrorCode errorCode = gatewayController.post(QString("%1v1/prem-v1/migrate"), apiPayload, responseBody);
-
-    if (errorCode == ErrorCode::NoError) {
-        auto responseObject = QJsonDocument::fromJson(responseBody).object();
-        QString premiumV2VpnKey = responseObject.value(apiDefs::key::config).toString();
-
-        emit importPremiumV2VpnKey(premiumV2VpnKey);
-    } else {
-        emit errorOccurred(ErrorCode::ApiMigrationError);
-    }
-}
-
-bool ApiPremV1MigrationController::isPremV1MigrationReminderActive()
-{
-    return m_settings->isPremV1MigrationReminderActive();
-}
-
-void ApiPremV1MigrationController::disablePremV1MigrationReminder()
-{
-    m_settings->disablePremV1MigrationReminder();
-}
--- a/client/core/controllers/api/apiPremV1MigrationController.h
+++ b/client/core/controllers/api/apiPremV1MigrationController.h
@@ -1,50 +0,0 @@
-#ifndef APIPREMV1MIGRATIONCONTROLLER_H
-#define APIPREMV1MIGRATIONCONTROLLER_H
-
-#include <QObject>
-
-#include "ui/models/servers_model.h"
-
-class ApiPremV1MigrationController : public QObject
-{
-    Q_OBJECT
-public:
-    ApiPremV1MigrationController(const QSharedPointer<ServersModel> &serversModel, const std::shared_ptr<Settings> &settings,
-                                 QObject *parent = nullptr);
-
-    Q_PROPERTY(QJsonArray subscriptionsModel READ getSubscriptionModel NOTIFY subscriptionsModelChanged)
-
-public slots:
-    bool hasConfigsToMigration();
-    void getSubscriptionList(const QString &email);
-    QJsonArray getSubscriptionModel();
-    void sendMigrationCode(const int subscriptionIndex);
-    void migrate(const QString &migrationCode);
-
-    bool isPremV1MigrationReminderActive();
-    void disablePremV1MigrationReminder();
-
-signals:
-    void subscriptionsModelChanged();
-
-    void otpSuccessfullySent();
-
-    void importPremiumV2VpnKey(const QString &vpnKey);
-
-    void errorOccurred(ErrorCode errorCode);
-
-    void showMigrationDrawer();
-    void migrationFinished();
-
-    void noSubscriptionToMigrate();
-
-private:
-    QSharedPointer<ServersModel> m_serversModel;
-    std::shared_ptr<Settings> m_settings;
-
-    QJsonArray m_subscriptionsModel;
-    int m_subscriptionIndex;
-    QString m_email;
-};
-
-#endif // APIPREMV1MIGRATIONCONTROLLER_H
--- a/client/core/controllers/api/apiSettingsController.cpp
+++ b/client/core/controllers/api/apiSettingsController.cpp
@@ -1,94 +0,0 @@
-#include "apiSettingsController.h"
-
-#include <QEventLoop>
-#include <QTimer>
-
-#include "core/api/apiUtils.h"
-#include "core/controllers/api/gatewayController.h"
-#include "version.h"
-
-namespace
-{
-    namespace configKey
-    {
-        constexpr char userCountryCode[] = "user_country_code";
-        constexpr char serverCountryCode[] = "server_country_code";
-        constexpr char serviceType[] = "service_type";
-        constexpr char serviceInfo[] = "service_info";
-
-        constexpr char apiConfig[] = "api_config";
-        constexpr char authData[] = "auth_data";
-    }
-
-    const int requestTimeoutMsecs = 12 * 1000; // 12 secs
-}
-
-ApiSettingsController::ApiSettingsController(const QSharedPointer<ServersModel> &serversModel,
-                                             const QSharedPointer<ApiAccountInfoModel> &apiAccountInfoModel,
-                                             const QSharedPointer<ApiCountryModel> &apiCountryModel,
-                                             const QSharedPointer<ApiDevicesModel> &apiDevicesModel,
-                                             const std::shared_ptr<Settings> &settings, QObject *parent)
-    : QObject(parent),
-      m_serversModel(serversModel),
-      m_apiAccountInfoModel(apiAccountInfoModel),
-      m_apiCountryModel(apiCountryModel),
-      m_apiDevicesModel(apiDevicesModel),
-      m_settings(settings)
-{
-}
-
-ApiSettingsController::~ApiSettingsController()
-{
-}
-
-ErrorCode ApiSettingsController::getAccountInfo(bool reload)
-{
-    if (reload) {
-        QEventLoop wait;
-        QTimer::singleShot(1000, &wait, &QEventLoop::quit);
-        wait.exec();
-    }
-
-    GatewayController gatewayController(m_settings->getGatewayEndpoint(), m_settings->isDevGatewayEnv(), requestTimeoutMsecs,
-                                        m_settings->isStrictKillSwitchEnabled());
-
-    auto processedIndex = m_serversModel->getProcessedServerIndex();
-    auto serverConfigPtr = m_serversModel->getServerConfig(processedIndex);
-    auto serverConfig = serverConfigPtr->toJson();
-    auto apiConfig = serverConfig.value(configKey::apiConfig).toObject();
-    auto authData = serverConfig.value(configKey::authData).toObject();
-
-    QJsonObject apiPayload;
-    apiPayload[configKey::userCountryCode] = apiConfig.value(configKey::userCountryCode).toString();
-    apiPayload[configKey::serviceType] = apiConfig.value(configKey::serviceType).toString();
-    apiPayload[configKey::authData] = authData;
-    apiPayload[apiDefs::key::cliVersion] = QString(APP_VERSION);
-
-    QByteArray responseBody;
-
-    ErrorCode errorCode = gatewayController.post(QString("%1v1/account_info"), apiPayload, responseBody);
-    if (errorCode != ErrorCode::NoError) {
-        return errorCode;
-    }
-
-    QJsonObject accountInfo = QJsonDocument::fromJson(responseBody).object();
-    m_apiAccountInfoModel->updateModel(accountInfo, serverConfig);
-
-    if (reload) {
-        updateApiCountryModel();
-        updateApiDevicesModel();
-    }
-
-    return ErrorCode::NoError;
-}
-
-void ApiSettingsController::updateApiCountryModel()
-{
-    m_apiCountryModel->updateModel(m_apiAccountInfoModel->getAvailableCountries(), "");
-    m_apiCountryModel->updateIssuedConfigsInfo(m_apiAccountInfoModel->getIssuedConfigsInfo());
-}
-
-void ApiSettingsController::updateApiDevicesModel()
-{
-    m_apiDevicesModel->updateModel(m_apiAccountInfoModel->getIssuedConfigsInfo());
-}
--- a/client/core/controllers/api/apiSettingsController.h
+++ b/client/core/controllers/api/apiSettingsController.h
@@ -1,34 +0,0 @@
-#ifndef APISETTINGSCONTROLLER_H
-#define APISETTINGSCONTROLLER_H
-
-#include <QObject>
-
-#include "ui/models/api/apiAccountInfoModel.h"
-#include "ui/models/api/apiCountryModel.h"
-#include "ui/models/api/apiDevicesModel.h"
-#include "ui/models/servers_model.h"
-
-class ApiSettingsController : public QObject
-{
-    Q_OBJECT
-public:
-    ApiSettingsController(const QSharedPointer<ServersModel> &serversModel, const QSharedPointer<ApiAccountInfoModel> &apiAccountInfoModel,
-                          const QSharedPointer<ApiCountryModel> &apiCountryModel, const QSharedPointer<ApiDevicesModel> &apiDevicesModel,
-                          const std::shared_ptr<Settings> &settings, QObject *parent = nullptr);
-    ~ApiSettingsController();
-
-public slots:
-    ErrorCode getAccountInfo(bool reload);
-    void updateApiCountryModel();
-    void updateApiDevicesModel();
-
-private:
-    QSharedPointer<ServersModel> m_serversModel;
-    QSharedPointer<ApiAccountInfoModel> m_apiAccountInfoModel;
-    QSharedPointer<ApiCountryModel> m_apiCountryModel;
-    QSharedPointer<ApiDevicesModel> m_apiDevicesModel;
-
-    std::shared_ptr<Settings> m_settings;
-};
-
-#endif // APISETTINGSCONTROLLER_H
--- a/client/core/controllers/api/gatewayController.cpp
+++ b/client/core/controllers/api/gatewayController.cpp
@@ -1,364 +0,0 @@
-#include "gatewayController.h"
-
-#include <algorithm>
-#include <random>
-
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QNetworkReply>
-#include <QUrl>
-
-#include "QBlockCipher.h"
-#include "QRsa.h"
-
-#include "amnezia_application.h"
-#include "core/api/apiUtils.h"
-#include "core/networkUtilities.h"
-#include "utilities.h"
-
-#ifdef AMNEZIA_DESKTOP
-    #include "core/ipcclient.h"
-#endif
-
-namespace
-{
-    namespace configKey
-    {
-        constexpr char aesKey[] = "aes_key";
-        constexpr char aesIv[] = "aes_iv";
-        constexpr char aesSalt[] = "aes_salt";
-
-        constexpr char apiPayload[] = "api_payload";
-        constexpr char keyPayload[] = "key_payload";
-    }
-
-    constexpr QLatin1String errorResponsePattern1("No active configuration found for");
-    constexpr QLatin1String errorResponsePattern2("No non-revoked public key found for");
-    constexpr QLatin1String errorResponsePattern3("Account not found.");
-
-    constexpr QLatin1String updateRequestResponsePattern("client version update is required");
-}
-
-GatewayController::GatewayController(const QString &gatewayEndpoint, const bool isDevEnvironment, const int requestTimeoutMsecs,
-                                     const bool isStrictKillSwitchEnabled, QObject *parent)
-    : QObject(parent),
-      m_gatewayEndpoint(gatewayEndpoint),
-      m_isDevEnvironment(isDevEnvironment),
-      m_requestTimeoutMsecs(requestTimeoutMsecs),
-      m_isStrictKillSwitchEnabled(isStrictKillSwitchEnabled)
-{
-}
-
-ErrorCode GatewayController::get(const QString &endpoint, QByteArray &responseBody)
-{
-#ifdef Q_OS_IOS
-    IosController::Instance()->requestInetAccess();
-    QThread::msleep(10);
-#endif
-
-    QNetworkRequest request;
-    request.setTransferTimeout(m_requestTimeoutMsecs);
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-
-    request.setUrl(QString(endpoint).arg(m_gatewayEndpoint));
-
-    // bypass killSwitch exceptions for API-gateway
-#ifdef AMNEZIA_DESKTOP
-    if (m_isStrictKillSwitchEnabled) {
-        QString host = QUrl(request.url()).host();
-        QString ip = NetworkUtilities::getIPAddress(host);
-        if (!ip.isEmpty()) {
-            IpcClient::Interface()->addKillSwitchAllowedRange(QStringList { ip });
-        }
-    }
-#endif
-
-    QNetworkReply *reply;
-    reply = amnApp->networkManager()->get(request);
-
-    QEventLoop wait;
-    QObject::connect(reply, &QNetworkReply::finished, &wait, &QEventLoop::quit);
-
-    QList<QSslError> sslErrors;
-    connect(reply, &QNetworkReply::sslErrors, [this, &sslErrors](const QList<QSslError> &errors) { sslErrors = errors; });
-    wait.exec();
-
-    responseBody = reply->readAll();
-
-    if (sslErrors.isEmpty() && shouldBypassProxy(reply, responseBody, false)) {
-        auto requestFunction = [&request, &responseBody](const QString &url) {
-            request.setUrl(url);
-            return amnApp->networkManager()->get(request);
-        };
-
-        auto replyProcessingFunction = [&responseBody, &reply, &sslErrors, this](QNetworkReply *nestedReply,
-                                                                                 const QList<QSslError> &nestedSslErrors) {
-            responseBody = nestedReply->readAll();
-            if (!sslErrors.isEmpty() || !shouldBypassProxy(nestedReply, responseBody, false)) {
-                sslErrors = nestedSslErrors;
-                reply = nestedReply;
-                return true;
-            }
-            return false;
-        };
-
-        bypassProxy(endpoint, reply, requestFunction, replyProcessingFunction);
-    }
-
-    auto errorCode = apiUtils::checkNetworkReplyErrors(sslErrors, reply);
-    reply->deleteLater();
-
-    return errorCode;
-}
-
-ErrorCode GatewayController::post(const QString &endpoint, const QJsonObject apiPayload, QByteArray &responseBody)
-{
-#ifdef Q_OS_IOS
-    IosController::Instance()->requestInetAccess();
-    QThread::msleep(10);
-#endif
-
-    QNetworkRequest request;
-    request.setTransferTimeout(m_requestTimeoutMsecs);
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-
-    request.setUrl(endpoint.arg(m_gatewayEndpoint));
-
-    // bypass killSwitch exceptions for API-gateway
-#ifdef AMNEZIA_DESKTOP
-    if (m_isStrictKillSwitchEnabled) {
-        QString host = QUrl(request.url()).host();
-        QString ip = NetworkUtilities::getIPAddress(host);
-        if (!ip.isEmpty()) {
-            IpcClient::Interface()->addKillSwitchAllowedRange(QStringList { ip });
-        }
-    }
-#endif
-
-    QSimpleCrypto::QBlockCipher blockCipher;
-    QByteArray key = blockCipher.generatePrivateSalt(32);
-    QByteArray iv = blockCipher.generatePrivateSalt(32);
-    QByteArray salt = blockCipher.generatePrivateSalt(8);
-
-    QJsonObject keyPayload;
-    keyPayload[configKey::aesKey] = QString(key.toBase64());
-    keyPayload[configKey::aesIv] = QString(iv.toBase64());
-    keyPayload[configKey::aesSalt] = QString(salt.toBase64());
-
-    QByteArray encryptedKeyPayload;
-    QByteArray encryptedApiPayload;
-    try {
-        QSimpleCrypto::QRsa rsa;
-
-        EVP_PKEY *publicKey = nullptr;
-        try {
-            QByteArray rsaKey = m_isDevEnvironment ? DEV_AGW_PUBLIC_KEY : PROD_AGW_PUBLIC_KEY;
-            QSimpleCrypto::QRsa rsa;
-            publicKey = rsa.getPublicKeyFromByteArray(rsaKey);
-        } catch (...) {
-            Utils::logException();
-            qCritical() << "error loading public key from environment variables";
-            return ErrorCode::ApiMissingAgwPublicKey;
-        }
-
-        encryptedKeyPayload = rsa.encrypt(QJsonDocument(keyPayload).toJson(), publicKey, RSA_PKCS1_PADDING);
-        EVP_PKEY_free(publicKey);
-
-        encryptedApiPayload = blockCipher.encryptAesBlockCipher(QJsonDocument(apiPayload).toJson(), key, iv, "", salt);
-    } catch (...) { // todo change error handling in QSimpleCrypto?
-        Utils::logException();
-        qCritical() << "error when encrypting the request body";
-        return ErrorCode::ApiConfigDecryptionError;
-    }
-
-    QJsonObject requestBody;
-    requestBody[configKey::keyPayload] = QString(encryptedKeyPayload.toBase64());
-    requestBody[configKey::apiPayload] = QString(encryptedApiPayload.toBase64());
-
-    QNetworkReply *reply = amnApp->networkManager()->post(request, QJsonDocument(requestBody).toJson());
-
-    QEventLoop wait;
-    connect(reply, &QNetworkReply::finished, &wait, &QEventLoop::quit);
-
-    QList<QSslError> sslErrors;
-    connect(reply, &QNetworkReply::sslErrors, [this, &sslErrors](const QList<QSslError> &errors) { sslErrors = errors; });
-    wait.exec();
-
-    QByteArray encryptedResponseBody = reply->readAll();
-
-    if (sslErrors.isEmpty() && shouldBypassProxy(reply, encryptedResponseBody, true, key, iv, salt)) {
-        auto requestFunction = [&request, &encryptedResponseBody, &requestBody](const QString &url) {
-            request.setUrl(url);
-            return amnApp->networkManager()->post(request, QJsonDocument(requestBody).toJson());
-        };
-
-        auto replyProcessingFunction = [&encryptedResponseBody, &reply, &sslErrors, &key, &iv, &salt,
-                                        this](QNetworkReply *nestedReply, const QList<QSslError> &nestedSslErrors) {
-            encryptedResponseBody = nestedReply->readAll();
-            reply = nestedReply;
-            if (!sslErrors.isEmpty() || shouldBypassProxy(nestedReply, encryptedResponseBody, true, key, iv, salt)) {
-                sslErrors = nestedSslErrors;
-                return false;
-            }
-            return true;
-        };
-
-        bypassProxy(endpoint, reply, requestFunction, replyProcessingFunction);
-    }
-
-    auto errorCode = apiUtils::checkNetworkReplyErrors(sslErrors, reply);
-    reply->deleteLater();
-    if (errorCode) {
-        return errorCode;
-    }
-
-    try {
-        responseBody = blockCipher.decryptAesBlockCipher(encryptedResponseBody, key, iv, "", salt);
-        return ErrorCode::NoError;
-    } catch (...) { // todo change error handling in QSimpleCrypto?
-        Utils::logException();
-        qCritical() << "error when decrypting the request body";
-        return ErrorCode::ApiConfigDecryptionError;
-    }
-}
-
-QStringList GatewayController::getProxyUrls()
-{
-    QNetworkRequest request;
-    request.setTransferTimeout(m_requestTimeoutMsecs);
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-
-    QEventLoop wait;
-    QList<QSslError> sslErrors;
-    QNetworkReply *reply;
-
-    QStringList proxyStorageUrls;
-    if (m_isDevEnvironment) {
-        proxyStorageUrls = QString(DEV_S3_ENDPOINT).split(", ");
-    } else {
-        proxyStorageUrls = QString(PROD_S3_ENDPOINT).split(", ");
-    }
-
-    QByteArray key = m_isDevEnvironment ? DEV_AGW_PUBLIC_KEY : PROD_AGW_PUBLIC_KEY;
-
-    for (const auto &proxyStorageUrl : proxyStorageUrls) {
-        request.setUrl(proxyStorageUrl);
-        reply = amnApp->networkManager()->get(request);
-
-        connect(reply, &QNetworkReply::finished, &wait, &QEventLoop::quit);
-        connect(reply, &QNetworkReply::sslErrors, [this, &sslErrors](const QList<QSslError> &errors) { sslErrors = errors; });
-        wait.exec();
-
-        if (reply->error() == QNetworkReply::NetworkError::NoError) {
-            auto encryptedResponseBody = reply->readAll();
-            reply->deleteLater();
-
-            EVP_PKEY *privateKey = nullptr;
-            QByteArray responseBody;
-            try {
-                if (!m_isDevEnvironment) {
-                    QCryptographicHash hash(QCryptographicHash::Sha512);
-                    hash.addData(key);
-                    QByteArray hashResult = hash.result().toHex();
-
-                    QByteArray key = QByteArray::fromHex(hashResult.left(64));
-                    QByteArray iv = QByteArray::fromHex(hashResult.mid(64, 32));
-
-                    QByteArray ba = QByteArray::fromBase64(encryptedResponseBody);
-
-                    QSimpleCrypto::QBlockCipher blockCipher;
-                    responseBody = blockCipher.decryptAesBlockCipher(ba, key, iv);
-                } else {
-                    responseBody = encryptedResponseBody;
-                }
-            } catch (...) {
-                Utils::logException();
-                qCritical() << "error loading private key from environment variables or decrypting payload" << encryptedResponseBody;
-                continue;
-            }
-
-            auto endpointsArray = QJsonDocument::fromJson(responseBody).array();
-
-            QStringList endpoints;
-            for (const auto &endpoint : endpointsArray) {
-                endpoints.push_back(endpoint.toString());
-            }
-            return endpoints;
-        } else {
-            apiUtils::checkNetworkReplyErrors(sslErrors, reply);
-            qDebug() << "go to the next storage endpoint";
-
-            reply->deleteLater();
-        }
-    }
-    return {};
-}
-
-bool GatewayController::shouldBypassProxy(QNetworkReply *reply, const QByteArray &responseBody, bool checkEncryption, const QByteArray &key,
-                                          const QByteArray &iv, const QByteArray &salt)
-{
-    if (reply->error() == QNetworkReply::NetworkError::OperationCanceledError || reply->error() == QNetworkReply::NetworkError::TimeoutError) {
-        qDebug() << "timeout occurred";
-        qDebug() << reply->error();
-        return true;
-    } else if (responseBody.contains("html")) {
-        qDebug() << "the response contains an html tag";
-        return true;
-    } else if (reply->error() == QNetworkReply::NetworkError::ContentNotFoundError) {
-        if (responseBody.contains(errorResponsePattern1) || responseBody.contains(errorResponsePattern2)
-            || responseBody.contains(errorResponsePattern3)) {
-            return false;
-        } else {
-            qDebug() << reply->error();
-            return true;
-        }
-    } else if (reply->error() == QNetworkReply::NetworkError::OperationNotImplementedError) {
-        if (responseBody.contains(updateRequestResponsePattern)) {
-            return false;
-        } else {
-            qDebug() << reply->error();
-            return true;
-        }
-    } else if (reply->error() != QNetworkReply::NetworkError::NoError) {
-        qDebug() << reply->error();
-        return true;
-    } else if (checkEncryption) {
-        try {
-            QSimpleCrypto::QBlockCipher blockCipher;
-            static_cast<void>(blockCipher.decryptAesBlockCipher(responseBody, key, iv, "", salt));
-        } catch (...) {
-            qDebug() << "failed to decrypt the data";
-            return true;
-        }
-    }
-    return false;
-}
-
-void GatewayController::bypassProxy(const QString &endpoint, QNetworkReply *reply,
-                                    std::function<QNetworkReply *(const QString &url)> requestFunction,
-                                    std::function<bool(QNetworkReply *reply, const QList<QSslError> &sslErrors)> replyProcessingFunction)
-{
-    QStringList proxyUrls = getProxyUrls();
-    std::random_device randomDevice;
-    std::mt19937 generator(randomDevice());
-    std::shuffle(proxyUrls.begin(), proxyUrls.end(), generator);
-
-    QEventLoop wait;
-    QList<QSslError> sslErrors;
-    QByteArray responseBody;
-
-    for (const QString &proxyUrl : proxyUrls) {
-        qDebug() << "go to the next proxy endpoint";
-        reply->deleteLater(); // delete the previous reply
-        reply = requestFunction(endpoint.arg(proxyUrl));
-
-        QObject::connect(reply, &QNetworkReply::finished, &wait, &QEventLoop::quit);
-        connect(reply, &QNetworkReply::sslErrors, [this, &sslErrors](const QList<QSslError> &errors) { sslErrors = errors; });
-        wait.exec();
-
-        if (replyProcessingFunction(reply, sslErrors)) {
-            break;
-        }
-    }
-}
--- a/client/core/controllers/api/gatewayController.h
+++ b/client/core/controllers/api/gatewayController.h
@@ -1,37 +0,0 @@
-#ifndef GATEWAYCONTROLLER_H
-#define GATEWAYCONTROLLER_H
-
-#include <QNetworkReply>
-#include <QObject>
-
-#include "core/defs.h"
-
-#ifdef Q_OS_IOS
-    #include "platforms/ios/ios_controller.h"
-#endif
-
-class GatewayController : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit GatewayController(const QString &gatewayEndpoint, const bool isDevEnvironment, const int requestTimeoutMsecs,
-                               const bool isStrictKillSwitchEnabled, QObject *parent = nullptr);
-
-    amnezia::ErrorCode get(const QString &endpoint, QByteArray &responseBody);
-    amnezia::ErrorCode post(const QString &endpoint, const QJsonObject apiPayload, QByteArray &responseBody);
-
-private:
-    QStringList getProxyUrls();
-    bool shouldBypassProxy(QNetworkReply *reply, const QByteArray &responseBody, bool checkEncryption, const QByteArray &key = "",
-                           const QByteArray &iv = "", const QByteArray &salt = "");
-    void bypassProxy(const QString &endpoint, QNetworkReply *reply, std::function<QNetworkReply *(const QString &url)> requestFunction,
-                     std::function<bool(QNetworkReply *reply, const QList<QSslError> &sslErrors)> replyProcessingFunction);
-
-    int m_requestTimeoutMsecs;
-    QString m_gatewayEndpoint;
-    bool m_isDevEnvironment = false;
-    bool m_isStrictKillSwitchEnabled = false;
-};
-
-#endif // GATEWAYCONTROLLER_H
--- a/client/core/controllers/apiController.cpp
+++ b/client/core/controllers/apiController.cpp
@@ -0,0 +1,423 @@
+#include "apiController.h"
+
+#include <QEventLoop>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QtConcurrent>
+
+#include "QBlockCipher.h"
+#include "QRsa.h"
+
+#include "amnezia_application.h"
+#include "configurators/wireguard_configurator.h"
+#include "core/enums/apiEnums.h"
+#include "version.h"
+
+namespace
+{
+    namespace configKey
+    {
+        constexpr char cloak[] = "cloak";
+        constexpr char awg[] = "awg";
+
+        constexpr char apiEdnpoint[] = "api_endpoint";
+        constexpr char accessToken[] = "api_key";
+        constexpr char certificate[] = "certificate";
+        constexpr char publicKey[] = "public_key";
+        constexpr char protocol[] = "protocol";
+
+        constexpr char uuid[] = "installation_uuid";
+        constexpr char osVersion[] = "os_version";
+        constexpr char appVersion[] = "app_version";
+
+        constexpr char userCountryCode[] = "user_country_code";
+        constexpr char serverCountryCode[] = "server_country_code";
+        constexpr char serviceType[] = "service_type";
+
+        constexpr char aesKey[] = "aes_key";
+        constexpr char aesIv[] = "aes_iv";
+        constexpr char aesSalt[] = "aes_salt";
+
+        constexpr char apiPayload[] = "api_payload";
+        constexpr char keyPayload[] = "key_payload";
+    }
+
+    const QStringList proxyStorageUrl = { "" };
+
+    ErrorCode checkErrors(const QList<QSslError> &sslErrors, QNetworkReply *reply)
+    {
+        if (!sslErrors.empty()) {
+            qDebug().noquote() << sslErrors;
+            return ErrorCode::ApiConfigSslError;
+        } else if (reply->error() == QNetworkReply::NoError) {
+            return ErrorCode::NoError;
+        } else if (reply->error() == QNetworkReply::NetworkError::OperationCanceledError
+                   || reply->error() == QNetworkReply::NetworkError::TimeoutError) {
+            return ErrorCode::ApiConfigTimeoutError;
+        } else {
+            QString err = reply->errorString();
+            qDebug() << QString::fromUtf8(reply->readAll());
+            qDebug() << reply->error();
+            qDebug() << err;
+            qDebug() << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
+            return ErrorCode::ApiConfigDownloadError;
+        }
+    }
+}
+
+ApiController::ApiController(const QString &gatewayEndpoint, bool isDevEnvironment, QObject *parent)
+    : QObject(parent), m_gatewayEndpoint(gatewayEndpoint), m_isDevEnvironment(isDevEnvironment)
+{
+}
+
+void ApiController::fillServerConfig(const QString &protocol, const ApiController::ApiPayloadData &apiPayloadData,
+                                     const QByteArray &apiResponseBody, QJsonObject &serverConfig)
+{
+    QString data = QJsonDocument::fromJson(apiResponseBody).object().value(config_key::config).toString();
+
+    data.replace("vpn://", "");
+    QByteArray ba = QByteArray::fromBase64(data.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
+
+    if (ba.isEmpty()) {
+        emit errorOccurred(ErrorCode::ApiConfigEmptyError);
+        return;
+    }
+
+    QByteArray ba_uncompressed = qUncompress(ba);
+    if (!ba_uncompressed.isEmpty()) {
+        ba = ba_uncompressed;
+    }
+
+    QString configStr = ba;
+    if (protocol == configKey::cloak) {
+        configStr.replace("<key>", "<key>\n");
+        configStr.replace("$OPENVPN_PRIV_KEY", apiPayloadData.certRequest.privKey);
+    } else if (protocol == configKey::awg) {
+        configStr.replace("$WIREGUARD_CLIENT_PRIVATE_KEY", apiPayloadData.wireGuardClientPrivKey);
+        auto serverConfig = QJsonDocument::fromJson(configStr.toUtf8()).object();
+        auto containers = serverConfig.value(config_key::containers).toArray();
+        if (containers.isEmpty()) {
+            return; // todo process error
+        }
+        auto container = containers.at(0).toObject();
+        QString containerName = ContainerProps::containerTypeToString(DockerContainer::Awg);
+        auto containerConfig = container.value(containerName).toObject();
+        auto protocolConfig = QJsonDocument::fromJson(containerConfig.value(config_key::last_config).toString().toUtf8()).object();
+        containerConfig[config_key::junkPacketCount] = protocolConfig.value(config_key::junkPacketCount);
+        containerConfig[config_key::junkPacketMinSize] = protocolConfig.value(config_key::junkPacketMinSize);
+        containerConfig[config_key::junkPacketMaxSize] = protocolConfig.value(config_key::junkPacketMaxSize);
+        containerConfig[config_key::initPacketJunkSize] = protocolConfig.value(config_key::initPacketJunkSize);
+        containerConfig[config_key::responsePacketJunkSize] = protocolConfig.value(config_key::responsePacketJunkSize);
+        containerConfig[config_key::initPacketMagicHeader] = protocolConfig.value(config_key::initPacketMagicHeader);
+        containerConfig[config_key::responsePacketMagicHeader] = protocolConfig.value(config_key::responsePacketMagicHeader);
+        containerConfig[config_key::underloadPacketMagicHeader] = protocolConfig.value(config_key::underloadPacketMagicHeader);
+        containerConfig[config_key::transportPacketMagicHeader] = protocolConfig.value(config_key::transportPacketMagicHeader);
+        container[containerName] = containerConfig;
+        containers.replace(0, container);
+        serverConfig[config_key::containers] = containers;
+        configStr = QString(QJsonDocument(serverConfig).toJson());
+    }
+
+    QJsonObject apiConfig = QJsonDocument::fromJson(configStr.toUtf8()).object();
+    serverConfig[config_key::dns1] = apiConfig.value(config_key::dns1);
+    serverConfig[config_key::dns2] = apiConfig.value(config_key::dns2);
+    serverConfig[config_key::containers] = apiConfig.value(config_key::containers);
+    serverConfig[config_key::hostName] = apiConfig.value(config_key::hostName);
+
+    if (apiConfig.value(config_key::configVersion).toInt() == ApiConfigSources::AmneziaGateway) {
+        serverConfig[config_key::configVersion] = apiConfig.value(config_key::configVersion);
+        serverConfig[config_key::description] = apiConfig.value(config_key::description);
+        serverConfig[config_key::name] = apiConfig.value(config_key::name);
+    }
+
+    auto defaultContainer = apiConfig.value(config_key::defaultContainer).toString();
+    serverConfig[config_key::defaultContainer] = defaultContainer;
+
+    return;
+}
+
+QStringList ApiController::getProxyUrls()
+{
+    QNetworkRequest request;
+    request.setTransferTimeout(7000);
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+
+    QEventLoop wait;
+    QList<QSslError> sslErrors;
+    QNetworkReply *reply;
+
+    for (const auto &proxyStorageUrl : proxyStorageUrl) {
+        request.setUrl(proxyStorageUrl);
+        reply = amnApp->manager()->get(request);
+
+        connect(reply, &QNetworkReply::finished, &wait, &QEventLoop::quit);
+        connect(reply, &QNetworkReply::sslErrors, [this, &sslErrors](const QList<QSslError> &errors) { sslErrors = errors; });
+        wait.exec();
+
+        if (reply->error() == QNetworkReply::NetworkError::NoError) {
+            break;
+        }
+        reply->deleteLater();
+    }
+
+    auto encryptedResponseBody = reply->readAll();
+    reply->deleteLater();
+
+    EVP_PKEY *privateKey = nullptr;
+    QByteArray responseBody;
+    try {
+        QByteArray key = PROD_PROXY_STORAGE_KEY;
+        QSimpleCrypto::QRsa rsa;
+        privateKey = rsa.getPrivateKeyFromByteArray(key, "");
+        responseBody = rsa.decrypt(encryptedResponseBody, privateKey, RSA_PKCS1_PADDING);
+    } catch (...) {
+        qCritical() << "error loading private key from environment variables or decrypting payload";
+        return {};
+    }
+
+    auto endpointsArray = QJsonDocument::fromJson(responseBody).array();
+
+    QStringList endpoints;
+    for (const auto &endpoint : endpointsArray) {
+        endpoints.push_back(endpoint.toString());
+    }
+    return endpoints;
+}
+
+ApiController::ApiPayloadData ApiController::generateApiPayloadData(const QString &protocol)
+{
+    ApiController::ApiPayloadData apiPayload;
+    if (protocol == configKey::cloak) {
+        apiPayload.certRequest = OpenVpnConfigurator::createCertRequest();
+    } else if (protocol == configKey::awg) {
+        auto connData = WireguardConfigurator::genClientKeys();
+        apiPayload.wireGuardClientPubKey = connData.clientPubKey;
+        apiPayload.wireGuardClientPrivKey = connData.clientPrivKey;
+    }
+    return apiPayload;
+}
+
+QJsonObject ApiController::fillApiPayload(const QString &protocol, const ApiController::ApiPayloadData &apiPayloadData)
+{
+    QJsonObject obj;
+    if (protocol == configKey::cloak) {
+        obj[configKey::certificate] = apiPayloadData.certRequest.request;
+    } else if (protocol == configKey::awg) {
+        obj[configKey::publicKey] = apiPayloadData.wireGuardClientPubKey;
+    }
+
+    obj[configKey::osVersion] = QSysInfo::productType();
+    obj[configKey::appVersion] = QString(APP_VERSION);
+
+    return obj;
+}
+
+void ApiController::updateServerConfigFromApi(const QString &installationUuid, const int serverIndex, QJsonObject serverConfig)
+{
+#ifdef Q_OS_IOS
+    IosController::Instance()->requestInetAccess();
+    QThread::msleep(10);
+#endif
+
+    if (serverConfig.value(config_key::configVersion).toInt()) {
+        QNetworkRequest request;
+        request.setTransferTimeout(7000);
+        request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+        request.setRawHeader("Authorization", "Api-Key " + serverConfig.value(configKey::accessToken).toString().toUtf8());
+        QString endpoint = serverConfig.value(configKey::apiEdnpoint).toString();
+        request.setUrl(endpoint);
+
+        QString protocol = serverConfig.value(configKey::protocol).toString();
+
+        ApiPayloadData apiPayloadData = generateApiPayloadData(protocol);
+
+        QJsonObject apiPayload = fillApiPayload(protocol, apiPayloadData);
+        apiPayload[configKey::uuid] = installationUuid;
+
+        QByteArray requestBody = QJsonDocument(apiPayload).toJson();
+
+        QNetworkReply *reply = amnApp->manager()->post(request, requestBody);
+
+        QObject::connect(reply, &QNetworkReply::finished, [this, reply, protocol, apiPayloadData, serverIndex, serverConfig]() mutable {
+            if (reply->error() == QNetworkReply::NoError) {
+                auto apiResponseBody = reply->readAll();
+                fillServerConfig(protocol, apiPayloadData, apiResponseBody, serverConfig);
+                emit finished(serverConfig, serverIndex);
+            } else {
+                if (reply->error() == QNetworkReply::NetworkError::OperationCanceledError
+                    || reply->error() == QNetworkReply::NetworkError::TimeoutError) {
+                    emit errorOccurred(ErrorCode::ApiConfigTimeoutError);
+                } else {
+                    QString err = reply->errorString();
+                    qDebug() << QString::fromUtf8(reply->readAll());
+                    qDebug() << reply->error();
+                    qDebug() << err;
+                    qDebug() << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
+                    emit errorOccurred(ErrorCode::ApiConfigDownloadError);
+                }
+            }
+
+            reply->deleteLater();
+        });
+
+        QObject::connect(reply, &QNetworkReply::errorOccurred,
+                         [this, reply](QNetworkReply::NetworkError error) { qDebug() << reply->errorString() << error; });
+        connect(reply, &QNetworkReply::sslErrors, [this, reply](const QList<QSslError> &errors) {
+            qDebug().noquote() << errors;
+            emit errorOccurred(ErrorCode::ApiConfigSslError);
+        });
+    }
+}
+
+ErrorCode ApiController::getServicesList(QByteArray &responseBody)
+{
+#ifdef Q_OS_IOS
+    IosController::Instance()->requestInetAccess();
+    QThread::msleep(10);
+#endif
+
+    QNetworkRequest request;
+    request.setTransferTimeout(7000);
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+
+    request.setUrl(QString("%1v1/services").arg(m_gatewayEndpoint));
+
+    QNetworkReply *reply;
+    reply = amnApp->manager()->get(request);
+
+    QEventLoop wait;
+    QObject::connect(reply, &QNetworkReply::finished, &wait, &QEventLoop::quit);
+
+    QList<QSslError> sslErrors;
+    connect(reply, &QNetworkReply::sslErrors, [this, &sslErrors](const QList<QSslError> &errors) { sslErrors = errors; });
+    wait.exec();
+
+    if (reply->error() == QNetworkReply::NetworkError::TimeoutError || reply->error() == QNetworkReply::NetworkError::OperationCanceledError) {
+        m_proxyUrls = getProxyUrls();
+        for (const QString &proxyUrl : m_proxyUrls) {
+            request.setUrl(QString("%1v1/services").arg(proxyUrl));
+            reply = amnApp->manager()->get(request);
+
+            QObject::connect(reply, &QNetworkReply::finished, &wait, &QEventLoop::quit);
+            connect(reply, &QNetworkReply::sslErrors, [this, &sslErrors](const QList<QSslError> &errors) { sslErrors = errors; });
+            wait.exec();
+            if (reply->error() != QNetworkReply::NetworkError::TimeoutError
+                && reply->error() != QNetworkReply::NetworkError::OperationCanceledError) {
+                break;
+            }
+            reply->deleteLater();
+        }
+    }
+
+    responseBody = reply->readAll();
+    auto errorCode = checkErrors(sslErrors, reply);
+    reply->deleteLater();
+    return errorCode;
+}
+
+ErrorCode ApiController::getConfigForService(const QString &installationUuid, const QString &userCountryCode, const QString &serviceType,
+                                             const QString &protocol, const QString &serverCountryCode, QJsonObject &serverConfig)
+{
+#ifdef Q_OS_IOS
+    IosController::Instance()->requestInetAccess();
+    QThread::msleep(10);
+#endif
+
+    QNetworkAccessManager manager;
+    QNetworkRequest request;
+    request.setTransferTimeout(7000);
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+
+    request.setUrl(QString("%1v1/config").arg(m_gatewayEndpoint));
+
+    ApiPayloadData apiPayloadData = generateApiPayloadData(protocol);
+
+    QJsonObject apiPayload = fillApiPayload(protocol, apiPayloadData);
+    apiPayload[configKey::userCountryCode] = userCountryCode;
+    if (!serverCountryCode.isEmpty()) {
+        apiPayload[configKey::serverCountryCode] = serverCountryCode;
+    }
+    apiPayload[configKey::serviceType] = serviceType;
+    apiPayload[configKey::uuid] = installationUuid;
+
+    QSimpleCrypto::QBlockCipher blockCipher;
+    QByteArray key = blockCipher.generatePrivateSalt(32);
+    QByteArray iv = blockCipher.generatePrivateSalt(32);
+    QByteArray salt = blockCipher.generatePrivateSalt(8);
+
+    QJsonObject keyPayload;
+    keyPayload[configKey::aesKey] = QString(key.toBase64());
+    keyPayload[configKey::aesIv] = QString(iv.toBase64());
+    keyPayload[configKey::aesSalt] = QString(salt.toBase64());
+
+    QByteArray encryptedKeyPayload;
+    QByteArray encryptedApiPayload;
+    try {
+        QSimpleCrypto::QRsa rsa;
+
+        EVP_PKEY *publicKey = nullptr;
+        try {
+            QByteArray key = m_isDevEnvironment ? DEV_AGW_PUBLIC_KEY : PROD_AGW_PUBLIC_KEY;
+            QSimpleCrypto::QRsa rsa;
+            publicKey = rsa.getPublicKeyFromByteArray(key);
+        } catch (...) {
+            qCritical() << "error loading public key from environment variables";
+            return ErrorCode::ApiMissingAgwPublicKey;
+        }
+
+        encryptedKeyPayload = rsa.encrypt(QJsonDocument(keyPayload).toJson(), publicKey, RSA_PKCS1_PADDING);
+        EVP_PKEY_free(publicKey);
+
+        encryptedApiPayload = blockCipher.encryptAesBlockCipher(QJsonDocument(apiPayload).toJson(), key, iv, "", salt);
+    } catch (...) { // todo change error handling in QSimpleCrypto?
+        qCritical() << "error when encrypting the request body";
+    }
+
+    QJsonObject requestBody;
+    requestBody[configKey::keyPayload] = QString(encryptedKeyPayload.toBase64());
+    requestBody[configKey::apiPayload] = QString(encryptedApiPayload.toBase64());
+
+    QNetworkReply *reply = manager.post(request, QJsonDocument(requestBody).toJson());
+
+    QEventLoop wait;
+    connect(reply, &QNetworkReply::finished, &wait, &QEventLoop::quit);
+
+    QList<QSslError> sslErrors;
+    connect(reply, &QNetworkReply::sslErrors, [this, &sslErrors](const QList<QSslError> &errors) { sslErrors = errors; });
+    wait.exec();
+
+    if (reply->error() == QNetworkReply::NetworkError::TimeoutError || reply->error() == QNetworkReply::NetworkError::OperationCanceledError) {
+        if (m_proxyUrls.isEmpty()) {
+            m_proxyUrls = getProxyUrls();
+        }
+        for (const QString &proxyUrl : m_proxyUrls) {
+            request.setUrl(QString("%1v1/config").arg(proxyUrl));
+            reply = manager.post(request, QJsonDocument(requestBody).toJson());
+
+            QObject::connect(reply, &QNetworkReply::finished, &wait, &QEventLoop::quit);
+            connect(reply, &QNetworkReply::sslErrors, [this, &sslErrors](const QList<QSslError> &errors) { sslErrors = errors; });
+            wait.exec();
+            if (reply->error() != QNetworkReply::NetworkError::TimeoutError
+                && reply->error() != QNetworkReply::NetworkError::OperationCanceledError) {
+                break;
+            }
+            reply->deleteLater();
+        }
+    }
+
+    auto errorCode = checkErrors(sslErrors, reply);
+    if (errorCode) {
+        return errorCode;
+    }
+
+    auto encryptedResponseBody = reply->readAll();
+    reply->deleteLater();
+    try {
+        auto responseBody = blockCipher.decryptAesBlockCipher(encryptedResponseBody, key, iv, "", salt);
+        fillServerConfig(protocol, apiPayloadData, responseBody, serverConfig);
+    } catch (...) { // todo change error handling in QSimpleCrypto?
+        qCritical() << "error when decrypting the request body";
+    }
+
+    return errorCode;
+}
--- a/client/core/controllers/apiController.h
+++ b/client/core/controllers/apiController.h
@@ -0,0 +1,50 @@
+#ifndef APICONTROLLER_H
+#define APICONTROLLER_H
+
+#include <QObject>
+
+#include "configurators/openvpn_configurator.h"
+
+#ifdef Q_OS_IOS
+    #include "platforms/ios/ios_controller.h"
+#endif
+
+class ApiController : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit ApiController(const QString &gatewayEndpoint, bool isDevEnvironment, QObject *parent = nullptr);
+
+public slots:
+    void updateServerConfigFromApi(const QString &installationUuid, const int serverIndex, QJsonObject serverConfig);
+
+    ErrorCode getServicesList(QByteArray &responseBody);
+    ErrorCode getConfigForService(const QString &installationUuid, const QString &userCountryCode, const QString &serviceType,
+                                  const QString &protocol, const QString &serverCountryCode, QJsonObject &serverConfig);
+
+signals:
+    void errorOccurred(ErrorCode errorCode);
+    void finished(const QJsonObject &config, const int serverIndex);
+
+private:
+    struct ApiPayloadData
+    {
+        OpenVpnConfigurator::ConnectionData certRequest;
+
+        QString wireGuardClientPrivKey;
+        QString wireGuardClientPubKey;
+    };
+
+    ApiPayloadData generateApiPayloadData(const QString &protocol);
+    QJsonObject fillApiPayload(const QString &protocol, const ApiController::ApiPayloadData &apiPayloadData);
+    void fillServerConfig(const QString &protocol, const ApiController::ApiPayloadData &apiPayloadData, const QByteArray &apiResponseBody,
+                          QJsonObject &serverConfig);
+    QStringList getProxyUrls();
+
+    QString m_gatewayEndpoint;
+    QStringList m_proxyUrls;
+    bool m_isDevEnvironment = false;
+};
+
+#endif // APICONTROLLER_H
--- a/client/core/controllers/configController.cpp
+++ b/client/core/controllers/configController.cpp
@@ -1,172 +0,0 @@
-#include "configController.h"
-
-#include "core/models/containers/containers_defs.h"
-#include "core/models/servers/apiV1ServerConfig.h"
-#include "core/models/servers/apiV2ServerConfig.h"
-#include "core/models/servers/selfHostedServerConfig.h"
-#include "core/networkUtilities.h"
-#include "protocols/protocols_defs.h"
-#include "settings.h"
-#include "core/models/protocols/awgProtocolConfig.h"
-#include "core/models/protocols/wireguardProtocolConfig.h"
-#include "core/models/protocols/openvpnProtocolConfig.h"
-#include "core/models/protocols/shadowsocksProtocolConfig.h"
-#include "core/models/protocols/cloakProtocolConfig.h"
-
-ConfigController::ConfigController(std::shared_ptr<Settings> settings, QObject *parent)
-    : QObject(parent), m_settings(settings)
-{
-}
-
-void ConfigController::addServer(const QSharedPointer<ServerConfig> &serverConfig)
-{
-    m_settings->addServer(serverConfig->toJson());
-    emit serverAdded(m_settings->serversCount() - 1);
-}
-
-void ConfigController::editServer(const QSharedPointer<ServerConfig> &serverConfig, int serverIndex)
-{
-    updateServerInSettings(serverConfig, serverIndex);
-    emit serverEdited(serverIndex);
-}
-
-void ConfigController::removeServer(int serverIndex)
-{
-    m_settings->removeServer(serverIndex);
-    emit serverRemoved(serverIndex);
-}
-
-void ConfigController::setDefaultServer(int serverIndex)
-{
-    m_settings->setDefaultServer(serverIndex);
-    emit defaultServerChanged(serverIndex);
-}
-
-void ConfigController::setDefaultContainer(int serverIndex, int containerIndex)
-{
-    auto servers = m_settings->serversArray();
-    if (serverIndex >= servers.size()) return;
-    
-    auto serverConfig = ServerConfig::createServerConfig(servers.at(serverIndex).toObject());
-    auto container = static_cast<DockerContainer>(containerIndex);
-    serverConfig->defaultContainer = ContainerProps::containerToString(container);
-    
-    updateServerInSettings(serverConfig, serverIndex);
-    emit defaultContainerChanged(serverIndex, container);
-}
-
-bool ConfigController::isServerFromApiAlreadyExists(quint16 crc) const
-{
-    auto servers = m_settings->serversArray();
-    for (const auto &server : servers) {
-        auto serverConfig = ServerConfig::createServerConfig(server.toObject());
-        if (static_cast<quint16>(serverConfig->crc) == crc) {
-            return true;
-        }
-    }
-    return false;
-}
-
-// Removed API-specific helpers; moved to ApiConfigsController
-
-QStringList ConfigController::getAllInstalledServicesName(int serverIndex) const
-{
-    auto servers = m_settings->serversArray();
-    if (serverIndex >= servers.size()) return {};
-    
-    auto serverConfig = ServerConfig::createServerConfig(servers.at(serverIndex).toObject());
-    
-    QStringList serviceNames;
-    for (auto it = serverConfig->containerConfigs.constBegin(); 
-         it != serverConfig->containerConfigs.constEnd(); ++it) {
-        const QString &containerName = it.key();
-        serviceNames.append(containerName);
-    }
-    return serviceNames;
-}
-
-void ConfigController::clearCachedProfile(int serverIndex, DockerContainer container)
-{
-    auto servers = m_settings->serversArray();
-    if (serverIndex >= servers.size()) return;
-    
-    auto serverConfig = ServerConfig::createServerConfig(servers.at(serverIndex).toObject());
-    
-    QString containerName = ContainerProps::containerToString(container);
-    if (serverConfig->containerConfigs.contains(containerName)) {
-        auto &containerConfig = serverConfig->containerConfigs[containerName];
-        containerConfig.clearProfile();
-        updateServerInSettings(serverConfig, serverIndex);
-    }
-}
-
-void ConfigController::updateServerInSettings(const QSharedPointer<ServerConfig> &serverConfig, int serverIndex)
-{
-    m_settings->editServer(serverIndex, serverConfig->toJson());
-} 
-
-bool ConfigController::isDefaultServerDefaultContainerHasSplitTunneling() const
-{
-    int defaultServerIndex = m_settings->defaultServerIndex();
-    auto servers = m_settings->serversArray();
-    if (defaultServerIndex >= servers.size()) return false;
-
-    auto serverConfig = ServerConfig::createServerConfig(servers.at(defaultServerIndex).toObject());
-    if (!serverConfig->containerConfigs.contains(serverConfig->defaultContainer)) {
-        return false;
-    }
-
-    const auto &containerConfig = serverConfig->containerConfigs[serverConfig->defaultContainer];
-    return checkSplitTunnelingInContainer(containerConfig, serverConfig->defaultContainer);
-}
-
-bool ConfigController::checkSplitTunnelingInContainer(const ContainerConfig &containerConfig, const QString &defaultContainer) const
-{
-    const DockerContainer containerType = ContainerProps::containerFromString(defaultContainer);
-
-    auto isWireguardHasSplit = [](const QString &nativeConfig, const QStringList &allowedIps) -> bool {
-        if (nativeConfig.contains("AllowedIPs") && !nativeConfig.contains("AllowedIPs = 0.0.0.0/0, ::/0")) {
-            return true;
-        }
-        if (!allowedIps.isEmpty() && !allowedIps.contains("0.0.0.0/0")) {
-            return true;
-        }
-        return false;
-    };
-
-    if (containerType == DockerContainer::Awg || containerType == DockerContainer::WireGuard) {
-        const auto protocolConfig = containerConfig.protocolConfigs.value(defaultContainer);
-        if (!protocolConfig) return false;
-        auto variant = ProtocolConfig::getProtocolConfigVariant(protocolConfig);
-        return std::visit(
-            [&](const auto &ptr) -> bool {
-                using T = std::decay_t<decltype(ptr)>;
-                if constexpr (std::is_same_v<T, QSharedPointer<AwgProtocolConfig>> || std::is_same_v<T, QSharedPointer<WireGuardProtocolConfig>>) {
-                    return isWireguardHasSplit(ptr->clientProtocolConfig.nativeConfig,
-                                               ptr->clientProtocolConfig.wireGuardData.allowedIps);
-                }
-                return false;
-            },
-            variant);
-    }
-
-    if (containerType == DockerContainer::Cloak || containerType == DockerContainer::OpenVpn || containerType == DockerContainer::ShadowSocks) {
-        const auto &protocolConfig = containerConfig.protocolConfigs.value(ContainerProps::containerTypeToString(DockerContainer::OpenVpn));
-        if (!protocolConfig) return false;
-        auto variant = ProtocolConfig::getProtocolConfigVariant(protocolConfig);
-        return std::visit(
-            [&](const auto &ptr) -> bool {
-                using T = std::decay_t<decltype(ptr)>;
-                if constexpr (std::is_same_v<T, QSharedPointer<OpenVpnProtocolConfig>> ||
-                              std::is_same_v<T, QSharedPointer<ShadowsocksProtocolConfig>> ||
-                              std::is_same_v<T, QSharedPointer<CloakProtocolConfig>>) {
-                    const auto nativeConfig = ptr->clientProtocolConfig.nativeConfig;
-                    return (!nativeConfig.isEmpty() && !nativeConfig.contains("redirect-gateway"));
-                }
-                return false;
-            },
-            variant);
-    }
-
-    return false;
-}
--- a/client/core/controllers/configController.h
+++ b/client/core/controllers/configController.h
@@ -1,59 +0,0 @@
-#ifndef CONFIGCONTROLLER_H
-#define CONFIGCONTROLLER_H
-
-#include <QObject>
-#include <QSharedPointer>
-
-#include "core/defs.h"
-#include "core/models/servers/serverConfig.h"
-#include "core/models/containers/containers_defs.h"
-
-class Settings;
-
-using namespace amnezia;
-
-class ConfigController : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit ConfigController(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
-    virtual ~ConfigController() = default;
-
-    // Basic server management
-    virtual void addServer(const QSharedPointer<ServerConfig> &serverConfig);
-    virtual void editServer(const QSharedPointer<ServerConfig> &serverConfig, int serverIndex);
-    virtual void removeServer(int serverIndex);
-    
-    // Default settings management
-    void setDefaultServer(int serverIndex);
-    void setDefaultContainer(int serverIndex, int containerIndex);
-    
-    // API server utilities
-    bool isServerFromApiAlreadyExists(quint16 crc) const;
-    
-    // General utilities
-    QStringList getAllInstalledServicesName(int serverIndex) const;
-    void clearCachedProfile(int serverIndex, DockerContainer container);
-
-    // Split tunneling detection
-    bool isDefaultServerDefaultContainerHasSplitTunneling() const;
-
-protected:
-    std::shared_ptr<Settings> m_settings;
-    
-    // Protected helper methods for derived classes
-    void updateServerInSettings(const QSharedPointer<ServerConfig> &serverConfig, int serverIndex);
-
-    bool checkSplitTunnelingInContainer(const ContainerConfig &containerConfig, const QString &defaultContainer) const;
-
-signals:
-    // Common server management signals
-    void serverAdded(int serverIndex);
-    void serverEdited(int serverIndex);
-    void serverRemoved(int serverIndex);
-    void defaultServerChanged(int serverIndex);
-    void defaultContainerChanged(int serverIndex, DockerContainer container);
-};
-
-#endif // CONFIGCONTROLLER_H 
--- a/client/core/controllers/connectionController.cpp
+++ b/client/core/controllers/connectionController.cpp
@@ -1,93 +0,0 @@
-#include "connectionController.h"
-
-#include <QtConcurrent>
-
-#include "core/controllers/vpnConfigurationController.h"
-#include "core/controllers/selfhosted/serverController.h"
-#include "core/models/containers/containers_defs.h"
-#include "core/models/containers/containerConfig.h"
-#include "settings.h"
-#include "logger.h"
-#include "utilities.h"
-
-namespace
-{
-    Logger logger("ConnectionController");
-}
-
-ConnectionController::ConnectionController(const QSharedPointer<VpnConnection> &vpnConnection,
-                                           std::shared_ptr<Settings> settings,
-                                           QObject *parent)
-    : QObject(parent), m_vpnConnection(vpnConnection), m_settings(settings)
-{
-}
-
-QFuture<QJsonObject> ConnectionController::prepareVpnConfiguration(const QSharedPointer<ServerConfig> &serverConfig,
-                                                                  DockerContainer container,
-                                                                  const QPair<QString, QString> &dns) const
-{
-    return QtConcurrent::run([this, serverConfig, container, dns]() -> QJsonObject {
-        logger.info() << "Preparing VPN configuration for container" << ContainerProps::containerToString(container);
-        
-        QSharedPointer<ServerController> serverController(new ServerController(m_settings));
-        VpnConfigurationsController vpnConfigurationController(m_settings, serverController);
-
-        QString containerName = ContainerProps::containerToString(container);
-        const ContainerConfig &containerConfig = serverConfig->containerConfigs.value(containerName);
-
-        auto vpnConfiguration = vpnConfigurationController.createVpnConfiguration(dns,
-                                                                                 serverConfig,
-                                                                                 containerConfig,
-                                                                                 container);
-        
-        emit configurationPrepared(vpnConfiguration);
-        return vpnConfiguration;
-    });
-}
-
-QFuture<ErrorCode> ConnectionController::openConnection(const int serverIndex,
-                                                        const QSharedPointer<ServerConfig> &serverConfig,
-                                                        const DockerContainer container,
-                                                        const ServerCredentials &credentials,
-                                                        const QPair<QString, QString> &dns)
-{
-    return QtConcurrent::run([this, serverIndex, serverConfig, container, credentials, dns]() -> ErrorCode {
-        if (!isServerSupported(container)) {
-            emit connectionError(ErrorCode::NotSupportedOnThisPlatform);
-            return ErrorCode::NotSupportedOnThisPlatform;
-        }
-
-        QSharedPointer<ServerController> serverController(new ServerController(m_settings));
-        VpnConfigurationsController vpnConfigurationController(m_settings, serverController);
-
-        const QString containerName = ContainerProps::containerToString(container);
-        const ContainerConfig &containerConfig = serverConfig->containerConfigs.value(containerName);
-        auto vpnConfiguration = vpnConfigurationController.createVpnConfiguration(dns, serverConfig, containerConfig, container);
-        emit connectionProgress(QString("Connecting to %1...").arg(ContainerProps::containerToString(container)));
-
-        QMetaObject::invokeMethod(m_vpnConnection.get(), "connectToVpn", Qt::QueuedConnection,
-                                  Q_ARG(int, serverIndex),
-                                  Q_ARG(ServerCredentials, credentials),
-                                  Q_ARG(DockerContainer, container),
-                                  Q_ARG(QJsonObject, vpnConfiguration));
-        return ErrorCode::NoError;
-    });
-}
-
-QFuture<ErrorCode> ConnectionController::closeConnection()
-{
-    return QtConcurrent::run([this]() -> ErrorCode {
-        QMetaObject::invokeMethod(m_vpnConnection.get(), "disconnectFromVpn", Qt::QueuedConnection);
-        return ErrorCode::NoError;
-    });
-}
-
-bool ConnectionController::isServerSupported(DockerContainer container) const
-{
-    return ContainerProps::isSupportedByCurrentPlatform(container);
-}
-
-ErrorCode ConnectionController::getLastConnectionError() const
-{
-    return m_vpnConnection ? m_vpnConnection->lastError() : ErrorCode::NoError;
-}
--- a/client/core/controllers/connectionController.h
+++ b/client/core/controllers/connectionController.h
@@ -1,57 +0,0 @@
-#ifndef CONNECTIONCONTROLLER_H
-#define CONNECTIONCONTROLLER_H
-
-#include <QObject>
-#include <QFuture>
-#include <QSharedPointer>
-
-#include "core/defs.h"
-#include "core/models/containers/containers_defs.h"
-#include "core/models/servers/serverConfig.h"
-#include "protocols/vpnprotocol.h"
-#include "vpnconnection.h"
-
-class Settings;
-class ServerController;
-class VpnConfigurationsController;
-
-using namespace amnezia;
-
-class ConnectionController : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit ConnectionController(const QSharedPointer<VpnConnection> &vpnConnection,
-                                  std::shared_ptr<Settings> settings,
-                                  QObject *parent = nullptr);
-
-    QFuture<QJsonObject> prepareVpnConfiguration(const QSharedPointer<ServerConfig> &serverConfig,
-                                                DockerContainer container,
-                                                const QPair<QString, QString> &dns) const;
-
-    QFuture<ErrorCode> openConnection(const int serverIndex,
-                                      const QSharedPointer<ServerConfig> &serverConfig,
-                                      const DockerContainer container,
-                                      const ServerCredentials &credentials,
-                                      const QPair<QString, QString> &dns);
-
-    QFuture<ErrorCode> closeConnection();
-
-    ErrorCode getLastConnectionError() const;
-
-signals:
-    void configurationPrepared(const QJsonObject &vpnConfiguration);
-    void connectionEstablished();
-    void connectionTerminated();
-    void connectionError(ErrorCode errorCode);
-    void connectionProgress(const QString &message);
-
-private:
-    bool isServerSupported(DockerContainer container) const;
-
-    QSharedPointer<VpnConnection> m_vpnConnection;
-    std::shared_ptr<Settings> m_settings;
-};
-
-#endif // CONNECTIONCONTROLLER_H 
--- a/client/core/controllers/coreController.cpp
+++ b/client/core/controllers/coreController.cpp
@@ -1,464 +0,0 @@
-#include "coreController.h"
-
-#include <QDirIterator>
-#include <QTranslator>
-
-#include "core/models/clientInfo.h"
-
-#if defined(Q_OS_ANDROID)
-    #include "core/installedAppsImageProvider.h"
-    #include "platforms/android/android_controller.h"
-#endif
-
-#if defined(Q_OS_IOS)
-    #include "platforms/ios/ios_controller.h"
-    #include <AmneziaVPN-Swift.h>
-#endif
-
-CoreController::CoreController(const QSharedPointer<VpnConnection> &vpnConnection, const std::shared_ptr<Settings> &settings,
-                               QQmlApplicationEngine *engine, QObject *parent)
-    : QObject(parent), m_vpnConnection(vpnConnection), m_settings(settings), m_engine(engine)
-{
-    initCoreControllers();
-    initModels();
-    initUIControllers();
-    initSignalHandlers();
-
-    initAndroidController();
-    initAppleController();
-
-    initNotificationHandler();
-
-    auto locale = m_settings->getAppLanguage();
-    m_translator.reset(new QTranslator());
-    updateTranslator(locale);
-}
-
-void CoreController::initModels()
-{
-    m_containersModel.reset(new ContainersModel(this));
-    m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());
-
-    m_defaultServerContainersModel.reset(new ContainersModel(this));
-    m_engine->rootContext()->setContextProperty("DefaultServerContainersModel", m_defaultServerContainersModel.get());
-
-    m_serversModel.reset(new ServersModel(m_settings, this));
-    m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
-
-    m_openVpnConfigModel = QSharedPointer<OpenVpnConfigModel>::create(this);
-    m_engine->rootContext()->setContextProperty("OpenVpnConfigModel", m_openVpnConfigModel.get());
-
-    m_shadowSocksConfigModel = QSharedPointer<ShadowSocksConfigModel>::create(this);
-    m_engine->rootContext()->setContextProperty("ShadowSocksConfigModel", m_shadowSocksConfigModel.get());
-
-    m_cloakConfigModel = QSharedPointer<CloakConfigModel>::create(this);
-    m_engine->rootContext()->setContextProperty("CloakConfigModel", m_cloakConfigModel.get());
-
-    m_wireGuardConfigModel = QSharedPointer<WireGuardConfigModel>::create(this);
-    m_engine->rootContext()->setContextProperty("WireGuardConfigModel", m_wireGuardConfigModel.get());
-
-    m_awgConfigModel = QSharedPointer<AwgConfigModel>::create(this);
-    m_engine->rootContext()->setContextProperty("AwgConfigModel", m_awgConfigModel.get());
-
-    m_xrayConfigModel = QSharedPointer<XrayConfigModel>::create(this);
-    m_engine->rootContext()->setContextProperty("XrayConfigModel", m_xrayConfigModel.get());
-
-#ifdef Q_OS_WINDOWS
-    m_ikev2ConfigModel = QSharedPointer<Ikev2ConfigModel>::create(this);
-    m_engine->rootContext()->setContextProperty("Ikev2ConfigModel", m_ikev2ConfigModel.get());
-#endif
-
-    m_sftpConfigModel = QSharedPointer<SftpConfigModel>::create(this);
-    m_engine->rootContext()->setContextProperty("SftpConfigModel", m_sftpConfigModel.get());
-
-    m_socks5ConfigModel = QSharedPointer<Socks5ProxyConfigModel>::create(this);
-    m_engine->rootContext()->setContextProperty("Socks5ProxyConfigModel", m_socks5ConfigModel.get());
-
-    m_protocolsModel.reset(new ProtocolsModel(m_openVpnConfigModel, m_shadowSocksConfigModel, m_cloakConfigModel, m_wireGuardConfigModel,
-                                              m_awgConfigModel, m_xrayConfigModel,
-#ifdef Q_OS_WINDOWS
-                                              m_ikev2ConfigModel,
-#endif
-                                              m_sftpConfigModel, m_socks5ConfigModel, this));
-    m_engine->rootContext()->setContextProperty("ProtocolsModel", m_protocolsModel.get());
-
-    auto clientManagementController = QSharedPointer<ClientManagementController>::create(m_settings, this);
-    m_clientManagementModel.reset(new ClientManagementModel(clientManagementController, this));
-
-    m_clientManagementUIController.reset(new ClientManagementUIController(clientManagementController, this));
-    m_engine->rootContext()->setContextProperty("ClientManagementUIController", m_clientManagementUIController.get());
-    m_engine->rootContext()->setContextProperty("ClientManagementModel", m_clientManagementModel.get());
-
-    m_apiServicesModel.reset(new ApiServicesModel(this));
-    m_engine->rootContext()->setContextProperty("ApiServicesModel", m_apiServicesModel.get());
-
-    m_apiCountryModel.reset(new ApiCountryModel(this));
-    m_engine->rootContext()->setContextProperty("ApiCountryModel", m_apiCountryModel.get());
-
-    m_apiAccountInfoModel.reset(new ApiAccountInfoModel(this));
-    m_engine->rootContext()->setContextProperty("ApiAccountInfoModel", m_apiAccountInfoModel.get());
-
-    m_apiDevicesModel.reset(new ApiDevicesModel(m_settings, this));
-    m_engine->rootContext()->setContextProperty("ApiDevicesModel", m_apiDevicesModel.get());
-
-    m_sitesModel.reset(new SitesModel(m_splitTunnelingController, this));
-    m_engine->rootContext()->setContextProperty("SitesModel", m_sitesModel.get());
-
-    m_allowedDnsModel.reset(new AllowedDnsModel(m_dnsController, this));
-    m_engine->rootContext()->setContextProperty("AllowedDnsModel", m_allowedDnsModel.get());
-
-    m_appSplitTunnelingModel.reset(new AppSplitTunnelingModel(m_splitTunnelingController, this));
-    m_engine->rootContext()->setContextProperty("AppSplitTunnelingModel", m_appSplitTunnelingModel.get());
-
-    m_languageModel.reset(new LanguageModel(m_settingsController, this));
-    m_engine->rootContext()->setContextProperty("LanguageModel", m_languageModel.get());
-}
-
-void CoreController::initCoreControllers()
-{
-    m_settingsController = QSharedPointer<SettingsController>::create(m_settings, this);
-    m_dnsController = QSharedPointer<DnsController>::create(m_settings, this);
-    m_splitTunnelingController = QSharedPointer<SplitTunnelingController>::create(m_settings, m_vpnConnection, this);
-    m_exportController = QSharedPointer<ExportController>::create(m_settings, this);
-    m_installController = QSharedPointer<InstallController>::create(m_settings, this);
-}
-
-void CoreController::initUIControllers()
-{
-    auto coreConnectionController = QSharedPointer<ConnectionController>::create(m_vpnConnection, m_settings, this);
-    m_connectionController.reset(
-            new ConnectionUIController(m_serversModel, m_containersModel, m_clientManagementModel, coreConnectionController));
-    m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
-
-    m_pageController.reset(new PageController(m_serversModel, m_settingsController));
-    m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
-
-    m_focusController.reset(new FocusController(m_engine, this));
-    m_engine->rootContext()->setContextProperty("FocusController", m_focusController.get());
-
-    auto clientManagementController = m_clientManagementUIController->getClientManagementController();
-    m_exportUIController.reset(new ExportUIController(m_serversModel, m_containersModel, m_clientManagementModel, m_exportController, clientManagementController));
-    m_engine->rootContext()->setContextProperty("ExportController", m_exportUIController.get());
-
-    m_installUIController.reset(new InstallUIController(m_serversModel, m_containersModel, m_protocolsModel, m_clientManagementModel, m_installController, m_apiConfigsCoreController, clientManagementController));
-    m_engine->rootContext()->setContextProperty("InstallController", m_installUIController.get());
-
-    connect(m_installUIController.get(), &InstallUIController::currentContainerUpdated, m_connectionController.get(),
-            &ConnectionUIController::onCurrentContainerUpdated);
-
-    m_importController.reset(new ImportController(m_serversModel, m_containersModel, m_settingsController));
-    m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());
-
-    m_settingsUIController.reset(
-            new SettingsUIController(m_serversModel, m_containersModel, m_languageModel, m_sitesModel, m_appSplitTunnelingModel, m_settingsController));
-    m_engine->rootContext()->setContextProperty("SettingsController", m_settingsUIController.get());
-
-    m_siteSplitUIController.reset(new SiteSplitUIController(m_splitTunnelingController, m_sitesModel));
-    m_engine->rootContext()->setContextProperty("SitesController", m_siteSplitUIController.get());
-
-    m_allowedDnsUIController.reset(new AllowedDnsUIController(m_dnsController, m_allowedDnsModel));
-    m_engine->rootContext()->setContextProperty("AllowedDnsController", m_allowedDnsUIController.get());
-
-    m_appSplitUIController.reset(new AppSplitUIController(m_splitTunnelingController, m_appSplitTunnelingModel));
-    m_engine->rootContext()->setContextProperty("AppSplitTunnelingController", m_appSplitUIController.get());
-
-    m_systemController.reset(new SystemController());
-    m_engine->rootContext()->setContextProperty("SystemController", m_systemController.get());
-
-    m_apiSettingsCoreController = QSharedPointer<ApiSettingsController>::create(m_serversModel, m_apiAccountInfoModel, m_apiCountryModel, m_apiDevicesModel, m_settings);
-    m_apiConfigsCoreController = QSharedPointer<ApiConfigsController>::create(m_serversModel, m_apiServicesModel, m_settings);
-    m_apiPremV1MigrationCoreController = QSharedPointer<ApiPremV1MigrationController>::create(m_serversModel, m_settings, this);
-
-    m_apiSettingsUIController.reset(new ApiSettingsUIController(m_serversModel, m_apiAccountInfoModel, m_apiCountryModel, m_apiDevicesModel, m_apiSettingsCoreController));
-    m_engine->rootContext()->setContextProperty("ApiSettingsController", m_apiSettingsUIController.get());
-
-    m_apiConfigUIController.reset(new ApiConfigUIController(m_serversModel, m_apiServicesModel, m_apiConfigsCoreController));
-    m_engine->rootContext()->setContextProperty("ApiConfigsController", m_apiConfigUIController.get());
-
-    m_apiPremV1MigrationUIController.reset(new ApiPremV1MigrationUIController(m_serversModel, m_apiPremV1MigrationCoreController));
-    m_engine->rootContext()->setContextProperty("ApiPremV1MigrationController", m_apiPremV1MigrationUIController.get());
-    
-    setupControllerSignalConnections();
-}
-
-void CoreController::setupControllerSignalConnections()
-{
-    auto clientManagementController = m_clientManagementUIController->getClientManagementController();
-    
-    connect(m_exportController.data(), &ExportController::clientAppendRequested,
-            clientManagementController.data(), 
-            [clientManagementController](const DockerContainer container, const ServerCredentials &credentials, 
-                                       const ContainerConfig &containerConfig, const QString &clientName, 
-                                       const QSharedPointer<ServerController> &serverController) {
-                QList<ClientInfo> clientsList;
-                ErrorCode result = clientManagementController->appendClient(container, credentials, containerConfig, 
-                                                                           clientName, serverController, clientsList);
-                emit clientManagementController->clientAppendCompleted(result);
-            });
-    
-    connect(m_exportController.data(), &ExportController::nativeConfigClientAppendRequested,
-            clientManagementController.data(),
-            [clientManagementController](const QSharedPointer<ProtocolConfig> &protocolConfig, const QString &clientName,
-                                       const DockerContainer container, const ServerCredentials &credentials,
-                                       const QSharedPointer<ServerController> &serverController) {
-                QList<ClientInfo> clientsList;
-                auto nonConstProtocolConfig = QSharedPointer<ProtocolConfig>(protocolConfig);
-                ErrorCode result = clientManagementController->appendClient(nonConstProtocolConfig, clientName, container,
-                                                                           credentials, serverController, clientsList);
-                emit clientManagementController->nativeConfigClientAppendCompleted(result);
-            });
-    
-    connect(clientManagementController.data(), &ClientManagementController::clientAppendCompleted,
-            m_exportController.data(), &ExportController::onClientAppendCompleted);
-    
-    connect(clientManagementController.data(), &ClientManagementController::nativeConfigClientAppendCompleted,
-            m_exportController.data(), &ExportController::onNativeConfigClientAppendCompleted);
-            
-    connect(m_installController.data(), &InstallController::clientAppendRequested,
-            clientManagementController.data(),
-            [clientManagementController](const DockerContainer container, const ServerCredentials &credentials,
-                                       const ContainerConfig &containerConfig, const QString &clientName,
-                                       const QSharedPointer<ServerController> &serverController) {
-                QList<ClientInfo> clientsList;
-                clientManagementController->appendClient(container, credentials, containerConfig,
-                                                        clientName, serverController, clientsList);
-            });
-}
-
-void CoreController::initAndroidController()
-{
-#ifdef Q_OS_ANDROID
-    if (!AndroidController::initLogging()) {
-        qFatal("Android logging initialization failed");
-    }
-    AndroidController::instance()->setSaveLogs(m_settings->isSaveLogs());
-    connect(m_settings.get(), &Settings::saveLogsChanged, AndroidController::instance(), &AndroidController::setSaveLogs);
-
-    AndroidController::instance()->setScreenshotsEnabled(m_settings->isScreenshotsEnabled());
-    connect(m_settings.get(), &Settings::screenshotsEnabledChanged, AndroidController::instance(), &AndroidController::setScreenshotsEnabled);
-
-    connect(m_settings.get(), &Settings::serverRemoved, AndroidController::instance(), &AndroidController::resetLastServer);
-
-    connect(m_settings.get(), &Settings::settingsCleared, []() { AndroidController::instance()->resetLastServer(-1); });
-
-    connect(AndroidController::instance(), &AndroidController::initConnectionState, this, [this](Vpn::ConnectionState state) {
-        m_connectionController->onConnectionStateChanged(state);
-        if (m_vpnConnection)
-            m_vpnConnection->restoreConnection();
-    });
-    if (!AndroidController::instance()->initialize()) {
-        qFatal("Android controller initialization failed");
-    }
-
-    connect(AndroidController::instance(), &AndroidController::importConfigFromOutside, this, [this](QString data) {
-        emit m_pageController->goToPageHome();
-        m_importController->extractConfigFromData(data);
-        data.clear();
-        emit m_pageController->goToPageViewConfig();
-    });
-
-    m_engine->addImageProvider(QLatin1String("installedAppImage"), new InstalledAppsImageProvider);
-#endif
-}
-
-void CoreController::initAppleController()
-{
-#ifdef Q_OS_IOS
-    IosController::Instance()->initialize();
-    connect(IosController::Instance(), &IosController::importConfigFromOutside, this, [this](QString data) {
-        emit m_pageController->goToPageHome();
-        m_importController->extractConfigFromData(data);
-        emit m_pageController->goToPageViewConfig();
-    });
-
-    connect(IosController::Instance(), &IosController::importBackupFromOutside, this, [this](QString filePath) {
-        emit m_pageController->goToPageHome();
-        m_pageController->goToPageSettingsBackup();
-        emit m_settingsUIController->importBackupFromOutside(filePath);
-    });
-
-    QTimer::singleShot(0, this, [this]() { AmneziaVPN::toggleScreenshots(m_settings->isScreenshotsEnabled()); });
-
-    connect(m_settings.get(), &Settings::screenshotsEnabledChanged, [](bool enabled) { AmneziaVPN::toggleScreenshots(enabled); });
-#endif
-}
-
-void CoreController::initSignalHandlers()
-{
-    initErrorMessagesHandler();
-
-    initApiCountryModelUpdateHandler();
-    initContainerModelUpdateHandler();
-    initAdminConfigRevokedHandler();
-    initPassphraseRequestHandler();
-    initTranslationsUpdatedHandler();
-    initAutoConnectHandler();
-    initAmneziaDnsToggledHandler();
-    initPrepareConfigHandler();
-    initImportPremiumV2VpnKeyHandler();
-    initShowMigrationDrawerHandler();
-    initStrictKillSwitchHandler();
-}
-
-void CoreController::initNotificationHandler()
-{
-#ifndef Q_OS_ANDROID
-    m_notificationHandler.reset(NotificationHandler::create(nullptr));
-
-    connect(m_vpnConnection.get(), &VpnConnection::connectionStateChanged, m_notificationHandler.get(),
-            &NotificationHandler::setConnectionState);
-
-    connect(m_notificationHandler.get(), &NotificationHandler::raiseRequested, m_pageController.get(), &PageController::raiseMainWindow);
-    connect(m_notificationHandler.get(), &NotificationHandler::connectRequested, m_connectionController.get(),
-            static_cast<void (ConnectionUIController::*)()>(&ConnectionUIController::openConnection));
-    connect(m_notificationHandler.get(), &NotificationHandler::disconnectRequested, m_connectionController.get(),
-            &ConnectionUIController::closeConnection);
-    connect(this, &CoreController::translationsUpdated, m_notificationHandler.get(), &NotificationHandler::onTranslationsUpdated);
-#endif
-}
-
-void CoreController::updateTranslator(const QLocale &locale)
-{
-    if (!m_translator->isEmpty()) {
-        QCoreApplication::removeTranslator(m_translator.get());
-    }
-
-    QStringList availableTranslations;
-    QDirIterator it(":/translations", QStringList("amneziavpn_*.qm"), QDir::Files);
-    while (it.hasNext()) {
-        availableTranslations << it.next();
-    }
-
-    const QString lang = locale.name().split("_").first();
-    const QString translationFilePrefix = QString(":/translations/amneziavpn_") + lang;
-    QString strFileName = QString(":/translations/amneziavpn_%1.qm").arg(locale.name());
-    for (const QString &translation : availableTranslations) {
-        if (translation.contains(translationFilePrefix)) {
-            strFileName = translation;
-            break;
-        }
-    }
-
-    if (m_translator->load(strFileName)) {
-        if (QCoreApplication::installTranslator(m_translator.get())) {
-            m_settings->setAppLanguage(locale);
-        }
-    } else {
-        m_settings->setAppLanguage(QLocale::English);
-    }
-
-    m_engine->retranslate();
-
-    emit translationsUpdated();
-}
-
-void CoreController::initErrorMessagesHandler()
-{
-    connect(m_connectionController.get(), &ConnectionUIController::connectionErrorOccurred, this, [this](ErrorCode errorCode) {
-        emit m_pageController->showErrorMessage(errorCode);
-        emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Disconnected);
-    });
-
-    connect(m_apiConfigUIController.get(), &ApiConfigUIController::errorOccurred, m_pageController.get(),
-            qOverload<ErrorCode>(&PageController::showErrorMessage));
-}
-
-void CoreController::setQmlRoot()
-{
-    m_systemController->setQmlRoot(m_engine->rootObjects().value(0));
-}
-
-void CoreController::initApiCountryModelUpdateHandler()
-{
-    connect(m_serversModel.get(), &ServersModel::updateApiCountryModel, this, [this]() {
-        m_apiCountryModel->updateModel(m_serversModel->getProcessedServerData("apiAvailableCountries").toJsonArray(),
-                                       m_serversModel->getProcessedServerData("apiServerCountryCode").toString());
-    });
-}
-
-void CoreController::initContainerModelUpdateHandler()
-{
-    connect(m_serversModel.get(), &ServersModel::containersUpdated, m_containersModel.get(), &ContainersModel::updateModel);
-    connect(m_serversModel.get(), &ServersModel::defaultServerContainersUpdated, m_defaultServerContainersModel.get(),
-            &ContainersModel::updateModel);
-    m_serversModel->resetModel();
-}
-
-void CoreController::initAdminConfigRevokedHandler()
-{
-    connect(m_clientManagementModel.get(), &ClientManagementModel::adminConfigRevoked, m_serversModel.get(),
-            &ServersModel::clearCachedProfile);
-}
-
-void CoreController::initPassphraseRequestHandler()
-{
-    
-}
-
-void CoreController::initTranslationsUpdatedHandler()
-{
-    connect(m_languageModel.get(), &LanguageModel::updateTranslations, this, &CoreController::updateTranslator);
-    connect(this, &CoreController::translationsUpdated, m_languageModel.get(), &LanguageModel::translationsUpdated);
-    connect(this, &CoreController::translationsUpdated, m_connectionController.get(), &ConnectionUIController::onTranslationsUpdated);
-}
-
-void CoreController::initAutoConnectHandler()
-{
-    if (m_settingsUIController->isAutoConnectEnabled() && m_serversModel->getDefaultServerIndex() >= 0) {
-        QTimer::singleShot(1000, this, [this]() { m_connectionController->openConnection(); });
-    }
-}
-
-void CoreController::initAmneziaDnsToggledHandler()
-{
-    connect(m_settingsUIController.get(), &SettingsUIController::amneziaDnsToggled, m_serversModel.get(), &ServersModel::toggleAmneziaDns);
-}
-
-void CoreController::initPrepareConfigHandler()
-{
-    connect(m_connectionController.get(), &ConnectionUIController::prepareConfig, this, [this]() {
-        emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Preparing);
-
-        if (!m_apiConfigUIController->isConfigValid()) {
-            emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Disconnected);
-            return;
-        }
-
-        if (!m_installController->isConfigValid(m_serversModel->getProcessedServerCredentials())) {
-            emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Disconnected);
-            return;
-        }
-
-        m_connectionController->openConnection();
-    });
-}
-
-void CoreController::initImportPremiumV2VpnKeyHandler()
-{
-    connect(m_apiPremV1MigrationUIController.get(), &ApiPremV1MigrationUIController::importPremiumV2VpnKey, this, [this](const QString &vpnKey) {
-        m_importController->extractConfigFromData(vpnKey);
-        m_importController->importConfig();
-
-        emit m_apiPremV1MigrationUIController->migrationFinished();
-    });
-}
-
-void CoreController::initShowMigrationDrawerHandler()
-{
-    QTimer::singleShot(1000, this, [this]() {
-        if (m_apiPremV1MigrationUIController->isPremV1MigrationReminderActive() && m_apiPremV1MigrationUIController->hasConfigsToMigration()) {
-            m_apiPremV1MigrationUIController->showMigrationDrawer();
-        }
-    });
-}
-
-void CoreController::initStrictKillSwitchHandler()
-{
-    connect(m_settingsUIController.get(), &SettingsUIController::strictKillSwitchEnabledChanged, m_vpnConnection.get(),
-            &VpnConnection::onKillSwitchModeChanged);
-}
-
-QSharedPointer<PageController> CoreController::pageController() const
-{
-    return m_pageController;
-}
--- a/client/core/controllers/coreController.h
+++ b/client/core/controllers/coreController.h
@@ -1,170 +0,0 @@
-#ifndef CORECONTROLLER_H
-#define CORECONTROLLER_H
-
-#include <QObject>
-#include <QQmlContext>
-#include <QThread>
-
-#include "ui/controllers/api/apiConfigUIController.h"
-#include "ui/controllers/api/apiSettingsUIController.h"
-#include "ui/controllers/api/apiPremV1MigrationUIController.h"
-#include "core/controllers/api/apiConfigController.h"
-#include "core/controllers/api/apiSettingsController.h"
-#include "core/controllers/api/apiPremV1MigrationController.h"
-#include "core/controllers/selfhosted/clientManagementController.h"
-#include "ui/controllers/appSplitUIController.h"
-#include "ui/controllers/allowedDnsUIController.h"
-#include "ui/controllers/connectionUIController.h"
-#include "core/controllers/selfhosted/exportController.h"
-#include "core/controllers/selfhosted/installController.h"
-#include "ui/controllers/selfhosted/exportUIController.h"
-#include "ui/controllers/focusController.h"
-#include "ui/controllers/importController.h"
-#include "ui/controllers/selfhosted/installUIController.h"
-#include "ui/controllers/pageController.h"
-#include "ui/controllers/settingsUIController.h"
-#include "ui/controllers/siteSplitUIController.h"
-#include "ui/controllers/systemController.h"
-#include "core/utils/fileUtils.h"
-#include "core/controllers/settingsController.h"
-#include "core/controllers/dnsController.h"
-#include "core/controllers/connectionController.h"
-#include "core/controllers/splitTunnelingController.h"
-
-#include "ui/models/allowed_dns_model.h"
-#include "ui/models/containers_model.h"
-#include "ui/models/languageModel.h"
-#include "ui/models/protocols/cloakConfigModel.h"
-#ifdef Q_OS_WINDOWS
-    #include "ui/models/protocols/ikev2ConfigModel.h"
-#endif
-#include "ui/models/api/apiAccountInfoModel.h"
-#include "ui/models/api/apiCountryModel.h"
-#include "ui/models/api/apiDevicesModel.h"
-#include "ui/models/api/apiServicesModel.h"
-#include "ui/models/appSplitTunnelingModel.h"
-#include "ui/models/selfhosted/clientManagementModel.h"
-#include "ui/controllers/selfhosted/clientManagementUIController.h"
-#include "ui/models/protocols/awgConfigModel.h"
-#include "ui/models/protocols/openvpnConfigModel.h"
-#include "ui/models/protocols/shadowsocksConfigModel.h"
-#include "ui/models/protocols/wireguardConfigModel.h"
-#include "ui/models/protocols/xrayConfigModel.h"
-#include "ui/models/protocols_model.h"
-#include "ui/models/servers_model.h"
-#include "ui/models/services/sftpConfigModel.h"
-#include "ui/models/services/socks5ProxyConfigModel.h"
-#include "ui/models/sites_model.h"
-
-#ifndef Q_OS_ANDROID
-    #include "ui/notificationhandler.h"
-#endif
-
-class CoreController : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit CoreController(const QSharedPointer<VpnConnection> &vpnConnection, const std::shared_ptr<Settings> &settings,
-                            QQmlApplicationEngine *engine, QObject *parent = nullptr);
-
-    QSharedPointer<PageController> pageController() const;
-    void setQmlRoot();
-
-signals:
-    void translationsUpdated();
-
-private:
-    void initModels();
-    void initCoreControllers();
-    void initUIControllers();
-    void initSignalHandlers();
-    void initAndroidController();
-    void initAppleController();
-    void setupControllerSignalConnections();
-
-    void initNotificationHandler();
-
-    void updateTranslator(const QLocale &locale);
-
-    void initErrorMessagesHandler();
-
-    void initApiCountryModelUpdateHandler();
-    void initContainerModelUpdateHandler();
-    void initAdminConfigRevokedHandler();
-    void initPassphraseRequestHandler();
-    void initTranslationsUpdatedHandler();
-    void initAutoConnectHandler();
-    void initAmneziaDnsToggledHandler();
-    void initPrepareConfigHandler();
-    void initImportPremiumV2VpnKeyHandler();
-    void initShowMigrationDrawerHandler();
-    void initStrictKillSwitchHandler();
-
-    QQmlApplicationEngine *m_engine {};
-    std::shared_ptr<Settings> m_settings;
-    QSharedPointer<VpnConnection> m_vpnConnection;
-    QSharedPointer<QTranslator> m_translator;
-
-#ifndef Q_OS_ANDROID
-    QScopedPointer<NotificationHandler> m_notificationHandler;
-#endif
-
-    QMetaObject::Connection m_reloadConfigErrorOccurredConnection;
-
-    QScopedPointer<ConnectionUIController> m_connectionController;
-    QScopedPointer<FocusController> m_focusController;
-    QSharedPointer<PageController> m_pageController;
-    QSharedPointer<ExportController> m_exportController;
-    QSharedPointer<InstallController> m_installController;
-    QScopedPointer<ExportUIController> m_exportUIController;
-    QScopedPointer<InstallUIController> m_installUIController;
-    QScopedPointer<ImportController> m_importController;
-    QScopedPointer<SettingsUIController> m_settingsUIController;
-    QScopedPointer<SiteSplitUIController> m_siteSplitUIController;
-    QScopedPointer<SystemController> m_systemController;
-    QScopedPointer<AppSplitUIController> m_appSplitUIController;
-    QScopedPointer<AllowedDnsUIController> m_allowedDnsUIController;
-
-    QSharedPointer<ApiSettingsController> m_apiSettingsCoreController;
-    QSharedPointer<ApiConfigsController> m_apiConfigsCoreController;
-    QSharedPointer<ApiPremV1MigrationController> m_apiPremV1MigrationCoreController;
-
-    QScopedPointer<ApiSettingsUIController> m_apiSettingsUIController;
-    QScopedPointer<ApiConfigUIController> m_apiConfigUIController;
-    QScopedPointer<ApiPremV1MigrationUIController> m_apiPremV1MigrationUIController;
-
-    QSharedPointer<SettingsController> m_settingsController;
-    QSharedPointer<DnsController> m_dnsController;
-    QSharedPointer<SplitTunnelingController> m_splitTunnelingController;
-
-    QSharedPointer<ContainersModel> m_containersModel;
-    QSharedPointer<ContainersModel> m_defaultServerContainersModel;
-    QSharedPointer<ServersModel> m_serversModel;
-    QSharedPointer<LanguageModel> m_languageModel;
-    QSharedPointer<ProtocolsModel> m_protocolsModel;
-    QSharedPointer<SitesModel> m_sitesModel;
-    QSharedPointer<AllowedDnsModel> m_allowedDnsModel;
-    QSharedPointer<AppSplitTunnelingModel> m_appSplitTunnelingModel;
-    QSharedPointer<ClientManagementModel> m_clientManagementModel;
-    QSharedPointer<ClientManagementUIController> m_clientManagementUIController;
-
-    QSharedPointer<ApiServicesModel> m_apiServicesModel;
-    QSharedPointer<ApiCountryModel> m_apiCountryModel;
-    QSharedPointer<ApiAccountInfoModel> m_apiAccountInfoModel;
-    QSharedPointer<ApiDevicesModel> m_apiDevicesModel;
-
-    QSharedPointer<OpenVpnConfigModel> m_openVpnConfigModel;
-    QSharedPointer<ShadowSocksConfigModel> m_shadowSocksConfigModel;
-    QSharedPointer<CloakConfigModel> m_cloakConfigModel;
-    QSharedPointer<XrayConfigModel> m_xrayConfigModel;
-    QSharedPointer<WireGuardConfigModel> m_wireGuardConfigModel;
-    QSharedPointer<AwgConfigModel> m_awgConfigModel;
-#ifdef Q_OS_WINDOWS
-    QSharedPointer<Ikev2ConfigModel> m_ikev2ConfigModel;
-#endif
-    QSharedPointer<SftpConfigModel> m_sftpConfigModel;
-    QSharedPointer<Socks5ProxyConfigModel> m_socks5ConfigModel;
-};
-
-#endif // CORECONTROLLER_H
--- a/client/core/controllers/dnsController.cpp
+++ b/client/core/controllers/dnsController.cpp
@@ -1,66 +0,0 @@
-#include "dnsController.h"
-#include "core/networkUtilities.h"
-
-DnsController::DnsController(std::shared_ptr<Settings> settings, QObject *parent)
-    : QObject(parent), m_settings(settings)
-{
-}
-
-bool DnsController::addDns(const QString &ip)
-{
-    if (!NetworkUtilities::ipAddressRegExp().match(ip).hasMatch()) {
-        return false;
-    }
-    
-    QStringList currentDnsServers = m_settings->allowedDnsServers();
-    
-    if (currentDnsServers.contains(ip)) {
-        return false;
-    }
-    
-    currentDnsServers.append(ip);
-    m_settings->setAllowedDnsServers(currentDnsServers);
-    
-    emit dnsAdded(ip);
-    return true;
-}
-
-bool DnsController::addDnsList(const QStringList &dnsServers, bool replaceExisting)
-{
-    QStringList currentDnsServers;
-    
-    if (!replaceExisting) {
-        currentDnsServers = m_settings->allowedDnsServers();
-    }
-    
-    for (const QString &ip : dnsServers) {
-        if (!currentDnsServers.contains(ip)) {
-            currentDnsServers.append(ip);
-        }
-    }
-    
-    m_settings->setAllowedDnsServers(currentDnsServers);
-    
-    emit dnsListAdded(dnsServers);
-    return true;
-}
-
-bool DnsController::removeDns(const QString &ip)
-{
-    QStringList currentDnsServers = m_settings->allowedDnsServers();
-    
-    if (!currentDnsServers.contains(ip)) {
-        return false;
-    }
-    
-    currentDnsServers.removeAll(ip);
-    m_settings->setAllowedDnsServers(currentDnsServers);
-    
-    emit dnsRemoved(ip);
-    return true;
-}
-
-QStringList DnsController::getAllowedDnsServers() const
-{
-    return m_settings->allowedDnsServers();
-} 
--- a/client/core/controllers/dnsController.h
+++ b/client/core/controllers/dnsController.h
@@ -1,32 +0,0 @@
-#ifndef DNSCONTROLLER_H
-#define DNSCONTROLLER_H
-
-#include <QObject>
-#include <QStringList>
-#include <QSharedPointer>
-
-#include "settings.h"
-
-class DnsController : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit DnsController(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
-
-    // DNS management
-    bool addDns(const QString &ip);
-    bool addDnsList(const QStringList &dnsServers, bool replaceExisting = false);
-    bool removeDns(const QString &ip);
-    QStringList getAllowedDnsServers() const;
-
-signals:
-    void dnsAdded(const QString &ip);
-    void dnsListAdded(const QStringList &dnsServers);
-    void dnsRemoved(const QString &ip);
-
-private:
-    std::shared_ptr<Settings> m_settings;
-};
-
-#endif // DNSCONTROLLER_H 
--- a/client/core/controllers/selfhosted/clientManagementController.cpp
+++ b/client/core/controllers/selfhosted/clientManagementController.cpp
@@ -1,825 +0,0 @@
-#include "clientManagementController.h"
-
-#include <QJsonDocument>
-#include <QJsonObject>
-
-#include "core/controllers/selfhosted/serverController.h"
-#include "core/models/protocols/openvpnProtocolConfig.h"
-#include "core/models/protocols/wireguardProtocolConfig.h"
-#include "core/models/protocols/awgProtocolConfig.h"
-#include "core/models/protocols/xrayProtocolConfig.h"
-#include "core/models/protocols/shadowsocksProtocolConfig.h"
-#include "core/models/protocols/cloakProtocolConfig.h"
-#include "core/models/protocols/ikev2ProtocolConfig.h"
-#include "core/models/protocols/sftpProtocolConfig.h"
-#include "core/models/protocols/socks5ProtocolConfig.h"
-#include "core/models/protocols/torWebsiteProtocolConfig.h"
-#include "core/models/protocols/protocolConfig.h"
-#include "core/models/clientInfo.h"
-#include <variant>
-#include "settings.h"
-#include "logger.h"
-#include "protocols/protocols_defs.h"
-
-using namespace amnezia;
-using namespace amnezia::config_key;
-
-namespace
-{
-    Logger logger("ClientManagementController");
-
-    namespace configKey
-    {
-        constexpr char clientId[] = "clientId";
-        constexpr char clientName[] = "clientName";
-        constexpr char container[] = "container";
-        constexpr char userData[] = "userData";
-        constexpr char creationDate[] = "creationDate";
-        constexpr char latestHandshake[] = "latestHandshake";
-        constexpr char dataReceived[] = "dataReceived";
-        constexpr char dataSent[] = "dataSent";
-        constexpr char allowedIps[] = "allowedIps";
-    }
-}
-
-ClientManagementController::ClientManagementController(std::shared_ptr<Settings> settings, QObject *parent)
-    : QObject(parent), m_settings(settings)
-{
-}
-
-QString ClientManagementController::getClientsTableFilePath(const DockerContainer container)
-{
-    QString clientsTableFile = QString("/opt/amnezia/%1/clientsTable");
-    if (container == DockerContainer::OpenVpn || container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
-        clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(DockerContainer::OpenVpn));
-    } else {
-        clientsTableFile = clientsTableFile.arg(ContainerProps::containerTypeToString(container));
-    }
-    return clientsTableFile;
-}
-
-void ClientManagementController::migration(const QByteArray &clientsTableString, QList<ClientInfo> &clientsList)
-{
-    QJsonObject clientsTableObj = QJsonDocument::fromJson(clientsTableString).object();
-
-    for (auto &clientId : clientsTableObj.keys()) {
-        ClientInfo client;
-        client.clientId = clientId;
-        client.clientName = clientsTableObj.value(clientId).toObject().value(configKey::clientName).toString();
-        client.creationDate = QDateTime::currentDateTime();
-
-        clientsList.append(client);
-    }
-}
-
-
-
-
-ErrorCode ClientManagementController::updateClientsData(const DockerContainer container, const ServerCredentials &credentials,
-                                                        const QSharedPointer<ServerController> &serverController, QList<ClientInfo> &clientsList)
-{
-    clientsList.clear();
-    ErrorCode error = ErrorCode::NoError;
-
-    QString clientsTableFile = getClientsTableFilePath(container);
-    const QByteArray clientsTableString = serverController->getTextFileFromContainer(container, credentials, clientsTableFile, error);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to get the clientsTable file from the server";
-        return error;
-    }
-
-    QJsonArray clientsTable = QJsonDocument::fromJson(clientsTableString).array();
-
-    if (clientsTable.isEmpty()) {
-        migration(clientsTableString, clientsList);
-        const QByteArray newClientsTableString = QJsonDocument(clientsToJsonArray(clientsList)).toJson();
-        error = serverController->uploadTextFileToContainer(container, credentials, newClientsTableString, clientsTableFile);
-        if (error != ErrorCode::NoError) {
-            logger.error() << "Failed to upload the clientsTable file to the server";
-            return error;
-        }
-    } else {
-        clientsList = clientsFromJsonArray(clientsTable);
-    }
-
-    int count = 0;
-    switch (container) {
-    case DockerContainer::OpenVpn:
-    case DockerContainer::ShadowSocks:
-    case DockerContainer::Cloak:
-        error = getOpenVpnClients(container, credentials, serverController, count, clientsList);
-        break;
-    case DockerContainer::WireGuard:
-    case DockerContainer::Awg:
-        error = getWireGuardClients(container, credentials, serverController, count, clientsList);
-        break;
-    case DockerContainer::Xray:
-        error = getXrayClients(container, credentials, serverController, count, clientsList);
-        break;
-    default:
-        error = ErrorCode::NoError;
-        break;
-    }
-
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to get clients for container" << ContainerProps::containerTypeToString(container);
-        return error;
-    }
-
-    emit clientsDataUpdated(clientsList);
-    return ErrorCode::NoError;
-}
-
-// UI-facing methods - create ServerController internally
-ErrorCode ClientManagementController::updateClientsData(const DockerContainer container, const ServerCredentials &credentials)
-{
-    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
-    QList<ClientInfo> clientsList;
-    return updateClientsData(container, credentials, serverController, clientsList);
-}
-
-
-
-
-
-ErrorCode ClientManagementController::appendClient(const DockerContainer container, const ServerCredentials &credentials,
-                                                   const ContainerConfig &containerConfig, const QString &clientName,
-                                                   const QSharedPointer<ServerController> &serverController, QList<ClientInfo> &clientsList)
-{
-    Proto protocol;
-    switch (container) {
-        case DockerContainer::ShadowSocks:
-        case DockerContainer::Cloak:
-            protocol = Proto::OpenVpn;
-            break;
-        case DockerContainer::OpenVpn:
-        case DockerContainer::WireGuard:
-        case DockerContainer::Awg:
-        case DockerContainer::Xray:
-            protocol = ContainerProps::defaultProtocol(container);
-            break;
-        default:
-            return ErrorCode::NoError;
-    }
-
-    QString protocolName = ProtocolProps::protoToString(protocol);
-    auto protocolConfig = containerConfig.protocolConfigs.value(protocolName);
-    return appendClient(protocolConfig, clientName, container, credentials, serverController, clientsList);
-}
-
-
-
-ErrorCode ClientManagementController::appendClient(QSharedPointer<ProtocolConfig> &protocolConfig, const QString &clientName, const DockerContainer container,
-                                                   const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController,
-                                                   QList<ClientInfo> &clientsList)
-{
-    QString clientId;
-    if (container == DockerContainer::Xray) {
-        if (!protocolConfig) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject protocolConfigJson = protocolConfig->toJson();
-        if (!protocolConfigJson.contains("outbounds")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonArray outbounds = protocolConfigJson.value("outbounds").toArray();
-        if (outbounds.isEmpty()) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject outbound = outbounds[0].toObject();
-        if (!outbound.contains("settings")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject settings = outbound["settings"].toObject();
-        if (!settings.contains("vnext")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonArray vnext = settings["vnext"].toArray();
-        if (vnext.isEmpty()) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject vnextObj = vnext[0].toObject();
-        if (!vnextObj.contains("users")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonArray users = vnextObj["users"].toArray();
-        if (users.isEmpty()) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject user = users[0].toObject();
-        if (!user.contains("id")) {
-            return ErrorCode::InternalError;
-        }
-        clientId = user["id"].toString();
-    } else {
-        if (!protocolConfig) {
-            return ErrorCode::InternalError;
-        }
-        ProtocolConfigVariant variant = ProtocolConfig::getProtocolConfigVariant(protocolConfig);
-        std::visit([&clientId](const auto &config) -> void {
-            clientId = config->clientProtocolConfig.clientId;
-        }, variant);
-    }
-    
-    return appendClient(clientId, clientName, container, credentials, serverController, clientsList);
-}
-
-
-
-ErrorCode ClientManagementController::appendClient(const QString &clientId, const QString &clientName, const DockerContainer container,
-                                                   const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController,
-                                                   QList<ClientInfo> &clientsList)
-{
-    ErrorCode error = ErrorCode::NoError;
-
-    QList<ClientInfo> currentClients;
-    error = updateClientsData(container, credentials, serverController, currentClients);
-    if (error != ErrorCode::NoError) {
-        return error;
-    }
-
-    for (int i = 0; i < currentClients.size(); ++i) {
-        if (currentClients[i].clientId == clientId) {
-            return renameClient(i, clientName, container, credentials, serverController, currentClients, true);
-        }
-    }
-
-    ClientInfo newClient(clientId, clientName);
-    newClient.container = container;
-    currentClients.append(newClient);
-
-    const QByteArray clientsTableString = QJsonDocument(clientsToJsonArray(currentClients)).toJson();
-    QString clientsTableFile = getClientsTableFilePath(container);
-
-    error = serverController->uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to upload the clientsTable file to the server";
-        return error;
-    }
-
-    clientsList = currentClients;
-    emit clientAdded(clientId, clientName);
-    return ErrorCode::NoError;
-}
-
-ErrorCode ClientManagementController::renameClient(const int row, const QString &clientName, const DockerContainer container, 
-                                                   const ServerCredentials &credentials, bool addTimeStamp)
-{
-    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
-    QList<ClientInfo> clientsList;
-    ErrorCode errorCode = updateClientsData(container, credentials, serverController, clientsList);
-    if (errorCode != ErrorCode::NoError) {
-        return errorCode;
-    }
-    return renameClient(row, clientName, container, credentials, serverController, clientsList, addTimeStamp);
-}
-
-ErrorCode ClientManagementController::renameClient(const int row, const QString &clientName, const DockerContainer container,
-                                                   const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController,
-                                                   QList<ClientInfo> &clientsList, bool addTimeStamp)
-{
-    if (row < 0 || row >= clientsList.size()) {
-        return ErrorCode::InternalError;
-    }
-
-    clientsList[row].clientName = clientName;
-    if (addTimeStamp) {
-        clientsList[row].creationDate = QDateTime::currentDateTime();
-    }
-
-    const QByteArray clientsTableString = QJsonDocument(clientsToJsonArray(clientsList)).toJson();
-    QString clientsTableFile = getClientsTableFilePath(container);
-
-    ErrorCode error = serverController->uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to upload the clientsTable file to the server";
-        return error;
-    }
-
-    emit clientRenamed(row, clientName);
-    return ErrorCode::NoError;
-}
-
- 
- 
-ErrorCode ClientManagementController::getWireGuardClients(const DockerContainer container, const ServerCredentials &credentials,
-                                                          const QSharedPointer<ServerController> &serverController, int &count, QList<ClientInfo> &clientsList)
-{
-    ErrorCode error = ErrorCode::NoError;
-
-    const QString wireGuardConfigFile = QString("opt/amnezia/%1/wg0.conf").arg(container == DockerContainer::WireGuard ? "wireguard" : "awg");
-    const QString wireguardConfigString = serverController->getTextFileFromContainer(container, credentials, wireGuardConfigFile, error);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to get the wg conf file from the server";
-        return error;
-    }
-
-    auto configLines = wireguardConfigString.split("\n", Qt::SkipEmptyParts);
-    QStringList wireguardKeys;
-    for (const auto &line : configLines) {
-        auto configPair = line.split(" = ", Qt::SkipEmptyParts);
-        if (configPair.front() == "PublicKey") {
-            wireguardKeys.push_back(configPair.back());
-        }
-    }
-
-    for (auto &wireguardKey : wireguardKeys) {
-        if (!isClientExists(wireguardKey, clientsList)) {
-            ClientInfo client(wireguardKey, QString("Client %1").arg(count));
-            client.container = container;
-            clientsList.append(client);
-            count++;
-        }
-    }
-    return error;
-}
-
-ErrorCode ClientManagementController::getXrayClients(const DockerContainer container, const ServerCredentials& credentials,
-                                                     const QSharedPointer<ServerController> &serverController, int &count, QList<ClientInfo> &clientsList)
-{
-    ErrorCode error = ErrorCode::NoError;
-
-    const QString serverConfigPath = amnezia::protocols::xray::serverConfigPath;
-    const QString configString = serverController->getTextFileFromContainer(container, credentials, serverConfigPath, error);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to get the xray server config file from the server";
-        return error;
-    }
-
-    QJsonDocument serverConfig = QJsonDocument::fromJson(configString.toUtf8());
-    if (serverConfig.isNull()) {
-        logger.error() << "Failed to parse xray server config JSON";
-        return ErrorCode::InternalError;
-    }
-
-    if (!serverConfig.object().contains("inbounds") || serverConfig.object()["inbounds"].toArray().isEmpty()) {
-        logger.error() << "Invalid xray server config structure";
-        return ErrorCode::InternalError;
-    }
-
-    const QJsonObject inbound = serverConfig.object()["inbounds"].toArray()[0].toObject();
-    if (!inbound.contains("settings")) {
-        logger.error() << "Missing settings in xray inbound config";
-        return ErrorCode::InternalError;
-    }
-
-    const QJsonObject settings = inbound["settings"].toObject();
-    if (!settings.contains("clients")) {
-        logger.error() << "Missing clients in xray settings config"; 
-        return ErrorCode::InternalError;
-    }
-
-    const QJsonArray clients = settings["clients"].toArray();
-    for (const auto &clientValue : clients) {
-        const QJsonObject clientObj = clientValue.toObject();
-        if (!clientObj.contains("id")) {
-            logger.error() << "Missing id in xray client config";
-            continue;
-        }
-        QString clientId = clientObj["id"].toString();
-        
-        QString xrayDefaultUuid = serverController->getTextFileFromContainer(container, credentials, amnezia::protocols::xray::uuidPath, error);
-        xrayDefaultUuid.replace("\n", "");
-
-        if (!isClientExists(clientId, clientsList) && clientId != xrayDefaultUuid) {
-            ClientInfo client(clientId, QString("Client %1").arg(count));
-            client.container = container;
-            clientsList.append(client);
-            count++;
-        }
-    }
-    
-    return error;
-}
-
-ErrorCode ClientManagementController::getOpenVpnClients(const DockerContainer container, const ServerCredentials &credentials,
-                                                       const QSharedPointer<ServerController> &serverController, int &count, QList<ClientInfo> &clientsList)
-{
-    Q_UNUSED(container);
-    Q_UNUSED(credentials);
-    Q_UNUSED(serverController);
-    count = clientsList.size();
-    return ErrorCode::NoError;
-}
-
-ErrorCode ClientManagementController::wgShow(const DockerContainer container, const ServerCredentials &credentials,
-                                            const QSharedPointer<ServerController> &serverController, std::vector<WgShowData> &data)
-{
-    if (container != DockerContainer::WireGuard && container != DockerContainer::Awg) {
-        return ErrorCode::NoError;
-    }
-
-    ErrorCode error = ErrorCode::NoError;
-    QString stdOut;
-    std::function<ErrorCode(const QString &, libssh::Client &)> cbReadStdOut = [&](const QString &data, libssh::Client &){
-        stdOut += data + "\n";
-        return ErrorCode::NoError;
-    };
-
-    const QString command = QString("sudo docker exec -i $CONTAINER_NAME bash -c '%1'").arg("wg show all");
-
-    QString script = serverController->replaceVars(command, serverController->generateVarsForContainer(credentials, container));
-    error = serverController->runScript(credentials, script, cbReadStdOut);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to execute wg show command";
-        return error;
-    }
-
-    if (stdOut.isEmpty()) {
-        return error;
-    }
-
-    const auto getStrValue = [](const auto str) { return str.mid(str.indexOf(":") + 1).trimmed(); };
-
-    const auto parts = stdOut.split('\n');
-    const auto peerList = parts.filter("peer:");
-    const auto latestHandshakeList = parts.filter("latest handshake:");
-    const auto transferredDataList = parts.filter("transfer:");
-    const auto allowedIpsList = parts.filter("allowed ips:");
-
-    if (allowedIpsList.isEmpty() || latestHandshakeList.isEmpty() || transferredDataList.isEmpty() || peerList.isEmpty()) {
-        return error;
-    }
-
-    const auto changeHandshakeFormat = [](QString &latestHandshake) {
-        const std::vector<std::pair<QString, QString>> replaceMap = { { " days", "d" },    { " hours", "h" }, { " minutes", "m" },
-                                                                      { " seconds", "s" }, { " day", "d" },   { " hour", "h" },
-                                                                      { " minute", "m" },  { " second", "s" } };
-
-        for (const auto &item : replaceMap) {
-            latestHandshake.replace(item.first, item.second);
-        }
-    };
-
-    for (int i = 0; i < peerList.size() && i < transferredDataList.size() && i < latestHandshakeList.size() && i < allowedIpsList.size(); ++i) {
-
-        const auto transferredData = getStrValue(transferredDataList[i]).split(",");
-        auto latestHandshake = getStrValue(latestHandshakeList[i]);
-        auto serverBytesReceived = transferredData.front().trimmed();
-        auto serverBytesSent = transferredData.back().trimmed();
-        auto allowedIps = getStrValue(allowedIpsList[i]);
-
-        changeHandshakeFormat(latestHandshake);
-
-        serverBytesReceived.chop(QStringLiteral(" received").length());
-        serverBytesSent.chop(QStringLiteral(" sent").length());
-
-        data.push_back({ getStrValue(peerList[i]), latestHandshake, serverBytesSent, serverBytesReceived, allowedIps });
-    }
-
-    return error;
-}
-
-
-
-ErrorCode ClientManagementController::revokeOpenVpn(const int row, const DockerContainer container, const ServerCredentials &credentials,
-                                                   const int serverIndex, const QSharedPointer<ServerController> &serverController)
-{
-    QList<ClientInfo> clientsList;
-    ErrorCode errorCode = updateClientsData(container, credentials, serverController, clientsList);
-    if (errorCode != ErrorCode::NoError) {
-        return errorCode;
-    }
-    return revokeOpenVpn(row, container, credentials, serverIndex, serverController, clientsList);
-}
-
-ErrorCode ClientManagementController::revokeWireGuard(const int row, const DockerContainer container, const ServerCredentials &credentials,
-                                                     const QSharedPointer<ServerController> &serverController)
-{
-    QList<ClientInfo> clientsList;
-    ErrorCode errorCode = updateClientsData(container, credentials, serverController, clientsList);
-    if (errorCode != ErrorCode::NoError) {
-        return errorCode;
-    }
-    return revokeWireGuard(row, container, credentials, serverController, clientsList);
-}
-
-ErrorCode ClientManagementController::revokeXray(const int row, const DockerContainer container, const ServerCredentials &credentials,
-                                                const QSharedPointer<ServerController> &serverController)
-{
-    QList<ClientInfo> clientsList;
-    ErrorCode errorCode = updateClientsData(container, credentials, serverController, clientsList);
-    if (errorCode != ErrorCode::NoError) {
-        return errorCode;
-    }
-    return revokeXray(row, container, credentials, serverController, clientsList);
-} 
-
-
-ErrorCode ClientManagementController::revokeClient(const int row, const DockerContainer container,
-                                                   const ServerCredentials &credentials, const int serverIndex)
-{
-    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
-    QList<ClientInfo> clientsList;
-    ErrorCode errorCode = updateClientsData(container, credentials, serverController, clientsList);
-    if (errorCode != ErrorCode::NoError) {
-        return errorCode;
-    }
-    return revokeClient(row, container, credentials, serverIndex, serverController, clientsList);
-}
-
-
-ErrorCode ClientManagementController::revokeClient(const int row, const DockerContainer container, const ServerCredentials &credentials,
-                                                   const int serverIndex, const QSharedPointer<ServerController> &serverController,
-                                                   QList<ClientInfo> &clientsList)
-{
-    if (row < 0 || row >= clientsList.size()) {
-        return ErrorCode::InternalError;
-    }
-
-    QString clientId = clientsList[row].clientId;
-    
-    ErrorCode errorCode = ErrorCode::NoError;
-
-    switch(container) {
-        case DockerContainer::OpenVpn:
-        case DockerContainer::ShadowSocks:
-        case DockerContainer::Cloak: {
-            errorCode = revokeOpenVpn(row, container, credentials, serverIndex, serverController, clientsList);
-            break;
-        }
-        case DockerContainer::WireGuard:
-        case DockerContainer::Awg: {
-            errorCode = revokeWireGuard(row, container, credentials, serverController, clientsList);
-            break;
-        }
-        case DockerContainer::Xray: {
-            errorCode = revokeXray(row, container, credentials, serverController, clientsList);
-            break;
-        }
-        default: {
-            logger.error() << "Internal error: received unexpected container type";
-            return ErrorCode::InternalError;
-        }
-    }
-
-    if (errorCode == ErrorCode::NoError) {
-        emit clientRevoked(row);
-    }
-
-    return errorCode;
-}
-
-ErrorCode ClientManagementController::revokeClient(const ContainerConfig &containerConfig, const DockerContainer container,
-                                                   const ServerCredentials &credentials, const int serverIndex,
-                                                   const QSharedPointer<ServerController> &serverController, QList<ClientInfo> &clientsList)
-{
-
-    Proto protocol;
-    switch(container) {
-        case DockerContainer::ShadowSocks:
-        case DockerContainer::Cloak: {
-            protocol = Proto::OpenVpn;
-            break;
-        }
-        case DockerContainer::OpenVpn:
-        case DockerContainer::WireGuard:
-        case DockerContainer::Awg:
-        case DockerContainer::Xray: {
-            protocol = ContainerProps::defaultProtocol(container);
-            break;
-        }
-        default: {
-            logger.error() << "Internal error: received unexpected container type";
-            return ErrorCode::InternalError;
-        }
-    }
-
-    auto protocolConfig = ContainerProps::getProtocolConfigFromContainer(protocol, containerConfig);
-
-
-    QString clientId;
-    if (container == DockerContainer::Xray) {
-        if (!protocolConfig) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject protocolConfigJson = protocolConfig->toJson();
-        if (!protocolConfigJson.contains("outbounds")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonArray outbounds = protocolConfigJson.value("outbounds").toArray();
-        if (outbounds.isEmpty()) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject outbound = outbounds[0].toObject();
-        if (!outbound.contains("settings")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject settings = outbound["settings"].toObject();
-        if (!settings.contains("vnext")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonArray vnext = settings["vnext"].toArray();
-        if (vnext.isEmpty()) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject vnextObj = vnext[0].toObject();
-        if (!vnextObj.contains("users")) {
-            return ErrorCode::InternalError;
-        }
-        QJsonArray users = vnextObj["users"].toArray();
-        if (users.isEmpty()) {
-            return ErrorCode::InternalError;
-        }
-        QJsonObject user = users[0].toObject();
-        if (!user.contains("id")) {
-            return ErrorCode::InternalError;
-        }
-        clientId = user["id"].toString();
-    } else {
-        if (!protocolConfig) {
-            return ErrorCode::InternalError;
-        }
-        ProtocolConfigVariant variant = ProtocolConfig::getProtocolConfigVariant(protocolConfig);
-        std::visit([&clientId](const auto &config) -> void {
-            clientId = config->clientProtocolConfig.clientId;
-        }, variant);
-    }
-
-
-    for (int i = 0; i < clientsList.size(); i++) {
-        if (clientsList[i].clientId == clientId) {
-            return revokeClient(i, container, credentials, serverIndex, serverController, clientsList);
-        }
-    }
-
-    return ErrorCode::InternalError;
-}
-
-ErrorCode ClientManagementController::revokeOpenVpn(const int row, const DockerContainer container, const ServerCredentials &credentials,
-                                                   const int serverIndex, const QSharedPointer<ServerController> &serverController,
-                                                   QList<ClientInfo> &clientsList)
-{
-    if (row < 0 || row >= clientsList.size()) {
-        return ErrorCode::InternalError;
-    }
-    QString clientId = clientsList[row].clientId;
-    
-    ErrorCode error = ErrorCode::NoError;
-    QString stdOut;
-    auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
-        stdOut += data + "\n";
-    };
-
-    const QString revokeClientScript = "sudo docker exec -i $CONTAINER_NAME bash -c './easyrsa --batch revoke %1'";
-    QString script = serverController->replaceVars(revokeClientScript.arg(clientId), 
-                                                   serverController->generateVarsForContainer(credentials, container));
-    error = serverController->runScript(credentials, script, cbReadStdOut);
-    if (error != ErrorCode::NoError) {
-        return error;
-    }
-
-    clientsList.removeAt(row);
-    const QByteArray clientsTableString = QJsonDocument(clientsToJsonArray(clientsList)).toJson();
-    QString clientsTableFile = getClientsTableFilePath(container);
-    
-    error = serverController->uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to upload the clientsTable file to the server";
-        return error;
-    }
-
-    return ErrorCode::NoError;
-}
-
-ErrorCode ClientManagementController::revokeWireGuard(const int row, const DockerContainer container, const ServerCredentials &credentials,
-                                                     const QSharedPointer<ServerController> &serverController, QList<ClientInfo> &clientsList)
-{
-    if (row < 0 || row >= clientsList.size()) {
-        return ErrorCode::InternalError;
-    }
-    QString clientId = clientsList[row].clientId;
-    
-    ErrorCode error = ErrorCode::NoError;
-    
-    const QString wireGuardConfigFile = QString("opt/amnezia/%1/wg0.conf").arg(container == DockerContainer::WireGuard ? "wireguard" : "awg");
-    const QString wireguardConfigString = serverController->getTextFileFromContainer(container, credentials, wireGuardConfigFile, error);
-    if (error != ErrorCode::NoError) {
-        return error;
-    }
-
-    QStringList configLines = wireguardConfigString.split("\n");
-    QStringList newConfigLines;
-    bool skipPeer = false;
-    
-    for (const QString &line : configLines) {
-        if (line.startsWith("[Peer]")) {
-            skipPeer = false;
-        }
-        if (line.contains("PublicKey") && line.contains(clientId)) {
-            skipPeer = true;
-            continue;
-        }
-        if (!skipPeer) {
-            newConfigLines.append(line);
-        }
-    }
-
-    QString newConfig = newConfigLines.join("\n");
-    error = serverController->uploadTextFileToContainer(container, credentials, newConfig.toUtf8(), wireGuardConfigFile);
-    if (error != ErrorCode::NoError) {
-        return error;
-    }
-
-    clientsList.removeAt(row);
-    const QByteArray clientsTableString = QJsonDocument(clientsToJsonArray(clientsList)).toJson();
-    QString clientsTableFile = getClientsTableFilePath(container);
-    
-    error = serverController->uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to upload the clientsTable file to the server";
-        return error;
-    }
-
-    return ErrorCode::NoError;
-}
-
-ErrorCode ClientManagementController::revokeXray(const int row, const DockerContainer container, const ServerCredentials &credentials,
-                                                const QSharedPointer<ServerController> &serverController, QList<ClientInfo> &clientsList)
-{
-    if (row < 0 || row >= clientsList.size()) {
-        return ErrorCode::InternalError;
-    }
-    QString clientId = clientsList[row].clientId;
-    
-    ErrorCode error = ErrorCode::NoError;
-    
-    const QString serverConfigPath = amnezia::protocols::xray::serverConfigPath;
-    const QString configString = serverController->getTextFileFromContainer(container, credentials, serverConfigPath, error);
-    if (error != ErrorCode::NoError) {
-        return error;
-    }
-
-    QJsonDocument serverConfig = QJsonDocument::fromJson(configString.toUtf8());
-    if (serverConfig.isNull()) {
-        return ErrorCode::InternalError;
-    }
-
-    QJsonObject configObj = serverConfig.object();
-    QJsonArray inbounds = configObj["inbounds"].toArray();
-    
-    for (int i = 0; i < inbounds.size(); i++) {
-        QJsonObject inbound = inbounds[i].toObject();
-        QJsonObject settings = inbound["settings"].toObject();
-        QJsonArray clients = settings["clients"].toArray();
-        
-        for (int j = 0; j < clients.size(); j++) {
-            QJsonObject clientObj = clients[j].toObject();
-            if (clientObj["id"].toString() == clientId) {
-                clients.removeAt(j);
-                settings["clients"] = clients;
-                inbound["settings"] = settings;
-                inbounds[i] = inbound;
-                break;
-            }
-        }
-    }
-    
-    configObj["inbounds"] = inbounds;
-    QJsonDocument newServerConfig(configObj);
-    
-    error = serverController->uploadTextFileToContainer(container, credentials, newServerConfig.toJson(), serverConfigPath);
-    if (error != ErrorCode::NoError) {
-        return error;
-    }
-
-    clientsList.removeAt(row);
-    const QByteArray clientsTableString = QJsonDocument(clientsToJsonArray(clientsList)).toJson();
-    QString clientsTableFile = getClientsTableFilePath(container);
-    
-    error = serverController->uploadTextFileToContainer(container, credentials, clientsTableString, clientsTableFile);
-    if (error != ErrorCode::NoError) {
-        logger.error() << "Failed to upload the clientsTable file to the server";
-        return error;
-    }
-
-    return ErrorCode::NoError;
-}
-
-QList<ClientInfo> ClientManagementController::clientsFromJsonArray(const QJsonArray &jsonArray)
-{
-    QList<ClientInfo> clientsList;
-    for (const auto &value : jsonArray) {
-        clientsList.append(ClientInfo(value.toObject()));
-    }
-    return clientsList;
-}
-
-QJsonArray ClientManagementController::clientsToJsonArray(const QList<ClientInfo> &clientsList)
-{
-    QJsonArray jsonArray;
-    for (const auto &client : clientsList) {
-        jsonArray.append(client.toJson());
-    }
-    return jsonArray;
-}
-
-bool ClientManagementController::isClientExists(const QString &clientId, const QList<ClientInfo> &clientsList)
-{
-    for (const auto &client : clientsList) {
-        if (client.clientId == clientId) {
-            return true;
-        }
-    }
-    return false;
-} 
--- a/client/core/controllers/selfhosted/clientManagementController.h
+++ b/client/core/controllers/selfhosted/clientManagementController.h
@@ -1,133 +0,0 @@
-#ifndef CLIENTMANAGEMENTCONTROLLER_H
-#define CLIENTMANAGEMENTCONTROLLER_H
-
-#include <QObject>
-#include <QSharedPointer>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QList>
-#include <vector>
-
-#include "core/defs.h"
-#include "core/models/containers/containers_defs.h"
-#include "core/models/containers/containerConfig.h"
-#include "core/models/protocols/protocolConfig.h"
-#include "core/models/clientInfo.h"
-
-class ServerController;
-class Settings;
-
-using namespace amnezia;
-
-struct WgShowData
-{
-    QString clientId;
-    QString latestHandshake;
-    QString dataReceived;
-    QString dataSent;
-    QString allowedIps;
-};
-
-class ClientManagementController : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit ClientManagementController(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
-
-    std::shared_ptr<Settings> getSettings() const { return m_settings; }
-
-    // UI-facing methods (no ServerController parameter - created internally)
-    ErrorCode updateClientsData(const DockerContainer container, const ServerCredentials &credentials);
-    
-    ErrorCode renameClient(const int row, const QString &clientName, const DockerContainer container, 
-                          const ServerCredentials &credentials, bool addTimeStamp = false);
-    
-    ErrorCode revokeClient(const int row, const DockerContainer container, const ServerCredentials &credentials, 
-                          const int serverIndex);
-
-    // Core methods using ClientInfo model
-    ErrorCode updateClientsData(const DockerContainer container, const ServerCredentials &credentials,
-                                const QSharedPointer<ServerController> &serverController, QList<ClientInfo> &clientsList);
-    
-    ErrorCode appendClient(const DockerContainer container, const ServerCredentials &credentials, 
-                          const ContainerConfig &containerConfig, const QString &clientName, 
-                          const QSharedPointer<ServerController> &serverController, QList<ClientInfo> &clientsList);
-    
-    ErrorCode appendClient(QSharedPointer<ProtocolConfig> &protocolConfig, const QString &clientName, const DockerContainer container,
-                          const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController, 
-                          QList<ClientInfo> &clientsList);
-    
-    ErrorCode appendClient(const QString &clientId, const QString &clientName, const DockerContainer container,
-                          const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController, 
-                          QList<ClientInfo> &clientsList);
-    
-    ErrorCode renameClient(const int row, const QString &clientName, const DockerContainer container, 
-                          const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController, 
-                          QList<ClientInfo> &clientsList, bool addTimeStamp = false);
-    
-    ErrorCode revokeClient(const int row, const DockerContainer container, const ServerCredentials &credentials, 
-                          const int serverIndex, const QSharedPointer<ServerController> &serverController, 
-                          QList<ClientInfo> &clientsList);
-    
-    ErrorCode revokeClient(const ContainerConfig &containerConfig, const DockerContainer container, 
-                          const ServerCredentials &credentials, const int serverIndex, 
-                          const QSharedPointer<ServerController> &serverController, QList<ClientInfo> &clientsList);
-
-    // WireGuard specific operations
-    ErrorCode wgShow(const DockerContainer container, const ServerCredentials &credentials,
-                     const QSharedPointer<ServerController> &serverController, std::vector<WgShowData> &data);
-
-signals:
-    void adminConfigRevoked(const DockerContainer container);
-    void clientsDataUpdated(const QList<ClientInfo> &clientsList);
-    void clientAdded(const QString &clientId, const QString &clientName);
-    void clientRenamed(const int row, const QString &newName);
-    void clientRevoked(const int row);
-    
-    void clientAppendCompleted(ErrorCode errorCode);
-    void nativeConfigClientAppendCompleted(ErrorCode errorCode);
-
-private:
-    // Protocol-specific client management
-    ErrorCode getOpenVpnClients(const DockerContainer container, const ServerCredentials &credentials,
-                               const QSharedPointer<ServerController> &serverController, int &count, QList<ClientInfo> &clientsList);
-    
-    ErrorCode getWireGuardClients(const DockerContainer container, const ServerCredentials &credentials,
-                                 const QSharedPointer<ServerController> &serverController, int &count, QList<ClientInfo> &clientsList);
-    
-    ErrorCode getXrayClients(const DockerContainer container, const ServerCredentials& credentials,
-                            const QSharedPointer<ServerController> &serverController, int &count, QList<ClientInfo> &clientsList);
-
-    // Protocol-specific client revocation
-    ErrorCode revokeOpenVpn(const int row, const DockerContainer container, const ServerCredentials &credentials, 
-                           const int serverIndex, const QSharedPointer<ServerController> &serverController, 
-                           QList<ClientInfo> &clientsList);
-    
-    ErrorCode revokeWireGuard(const int row, const DockerContainer container, const ServerCredentials &credentials,
-                             const QSharedPointer<ServerController> &serverController, QList<ClientInfo> &clientsList);
-    
-    ErrorCode revokeXray(const int row, const DockerContainer container, const ServerCredentials &credentials,
-                        const QSharedPointer<ServerController> &serverController, QList<ClientInfo> &clientsList);
-
-    // Internal wrappers to fetch clients list then delegate to detailed versions
-    ErrorCode revokeOpenVpn(const int row, const DockerContainer container, const ServerCredentials &credentials, 
-                            const int serverIndex, const QSharedPointer<ServerController> &serverController);
-    ErrorCode revokeWireGuard(const int row, const DockerContainer container, const ServerCredentials &credentials,
-                              const QSharedPointer<ServerController> &serverController);
-    ErrorCode revokeXray(const int row, const DockerContainer container, const ServerCredentials &credentials,
-                         const QSharedPointer<ServerController> &serverController);
-
-    // Helper methods
-    bool isClientExists(const QString &clientId, const QList<ClientInfo> &clientsList);
-    void migration(const QByteArray &clientsTableString, QList<ClientInfo> &clientsList);
-    QString getClientsTableFilePath(const DockerContainer container);
-    
-    // JSON serialization for persistence only
-    static QList<ClientInfo> clientsFromJsonArray(const QJsonArray &jsonArray);
-    static QJsonArray clientsToJsonArray(const QList<ClientInfo> &clientsList);
-
-    std::shared_ptr<Settings> m_settings;
-};
-
-#endif // CLIENTMANAGEMENTCONTROLLER_H 
--- a/client/core/controllers/selfhosted/exportController.cpp
+++ b/client/core/controllers/selfhosted/exportController.cpp
@@ -1,353 +0,0 @@
-#include "exportController.h"
-
-#include <QBuffer>
-#include <QDataStream>
-#include <QJsonDocument>
-
-#include "core/controllers/vpnConfigurationController.h"
-#include "core/controllers/selfhosted/serverController.h"
-#include "core/controllers/selfhosted/clientManagementController.h"
-#include "core/qrCodeUtils.h"
-#include <QEventLoop>
-#include <QTimer>
-
-ExportController::ExportController(std::shared_ptr<Settings> settings,
-                                   QObject *parent)
-    : QObject(parent),
-      m_settings(settings),
-      m_lastClientAppendResult(ErrorCode::NoError),
-      m_lastNativeConfigAppendResult(ErrorCode::NoError),
-      m_waitingForClientAppend(false),
-      m_waitingForNativeConfigAppend(false)
-{
-}
-
-ExportConfigResult ExportController::generateFullAccessConfig(const QSharedPointer<ServerConfig> &serverConfig)
-{
-    ExportConfigResult result;
-    result.errorCode = ErrorCode::NoError;
-
-    // Create a copy of the ServerConfig and clean last_config from protocol configs
-    auto modifiedServerConfig = QSharedPointer<ServerConfig>::create(*serverConfig);
-    
-    for (auto &containerConfig : modifiedServerConfig->containerConfigs) {
-        for (auto &protocolConfig : containerConfig.protocolConfigs) {
-            // Protocol configs will automatically exclude last_config when serialized to JSON for export
-            // No need to manually remove it here as the toJson() method handles this
-        }
-    }
-
-    QByteArray compressedConfig = QJsonDocument(modifiedServerConfig->toJson()).toJson();
-    compressedConfig = qCompress(compressedConfig, 8);
-    result.config = QString("vpn://%1").arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals)));
-    result.qrCodes = generateQrCodeSeries(compressedConfig);
-
-    return result;
-}
-
-ExportConfigResult ExportController::generateConnectionConfig(const QString &clientName,
-                                                             const ServerCredentials &credentials,
-                                                             const DockerContainer container,
-                                                             const ContainerConfig &containerConfig,
-                                                             const QSharedPointer<ServerConfig> &serverConfig,
-                                                             const QPair<QString, QString> &dnsSettings)
-{
-    ExportConfigResult result;
-    
-    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
-    VpnConfigurationsController vpnConfigurationController(m_settings, serverController);
-    
-    // Use the provided ContainerConfig directly
-    ContainerConfig modifiedContainerConfig = containerConfig;
-    
-    result.errorCode = vpnConfigurationController.createProtocolConfigForContainer(credentials, container, modifiedContainerConfig);
-    if (result.errorCode != ErrorCode::NoError) {
-        return result;
-    }
-
-    m_waitingForClientAppend = true;
-    emit clientAppendRequested(container, credentials, modifiedContainerConfig, clientName, serverController);
-    
-    QEventLoop loop;
-    QTimer timer;
-    timer.setSingleShot(true);
-    timer.setInterval(30000);
-    
-    connect(this, &ExportController::onClientAppendCompleted, &loop, &QEventLoop::quit);
-    connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
-    
-    timer.start();
-    loop.exec();
-    
-    m_waitingForClientAppend = false;
-    result.errorCode = m_lastClientAppendResult;
-    if (result.errorCode != ErrorCode::NoError) {
-        return result;
-    }
-
-    // Create a modified ServerConfig for export with only the specific container
-    auto exportServerConfig = QSharedPointer<ServerConfig>::create(*serverConfig);
-    
-    // Remove credentials (they are not needed in export)
-    exportServerConfig->containerConfigs.clear();
-    
-    // Add only the specific container being exported
-    QString containerName = ContainerProps::containerToString(container);
-    exportServerConfig->containerConfigs.insert(containerName, modifiedContainerConfig);
-    exportServerConfig->defaultContainer = containerName;
-    exportServerConfig->dns1 = dnsSettings.first;
-    exportServerConfig->dns2 = dnsSettings.second;
-
-    QByteArray compressedConfig = QJsonDocument(exportServerConfig->toJson()).toJson();
-    compressedConfig = qCompress(compressedConfig, 8);
-    result.config = QString("vpn://%1").arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals)));
-    result.qrCodes = generateQrCodeSeries(compressedConfig);
-
-    return result;
-}
-
-ExportConfigResult ExportController::generateOpenVpnConfig(const QString &clientName,
-                                                        const ServerCredentials &credentials,
-                                                        const DockerContainer container,
-                                                        const ContainerConfig &containerConfig,
-                                                        const QPair<QString, QString> &dnsSettings,
-                                                        bool isApiConfig)
-{
-    ExportConfigResult result;
-    QJsonObject nativeConfig;
-    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
-
-    Proto protocol = Proto::OpenVpn;
-    if (container == DockerContainer::Cloak || container == DockerContainer::ShadowSocks) {
-        protocol = Proto::OpenVpn;
-    } else {
-        protocol = ContainerProps::defaultProtocol(container);
-    }
-
-    result.errorCode = generateNativeConfig(container, clientName, protocol, credentials, 
-                                           containerConfig, dnsSettings, isApiConfig, nativeConfig, serverController);
-    if (result.errorCode != ErrorCode::NoError) {
-        return result;
-    }
-
-    QStringList lines = nativeConfig.value(config_key::config).toString().replace("\r", "").split("\n");
-    for (const QString &line : std::as_const(lines)) {
-        result.config.append(line + "\n");
-    }
-
-    result.qrCodes = generateQrCodeSeries(result.config.toUtf8());
-    return result;
-}
-
-ExportConfigResult ExportController::generateWireGuardConfig(const QString &clientName,
-                                                            const ServerCredentials &credentials,
-                                                            const ContainerConfig &containerConfig,
-                                                            const QPair<QString, QString> &dnsSettings,
-                                                            bool isApiConfig)
-{
-    ExportConfigResult result;
-    QJsonObject nativeConfig;
-    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
-
-    result.errorCode = generateNativeConfig(DockerContainer::WireGuard, clientName, Proto::WireGuard, 
-                                           credentials, containerConfig, dnsSettings, isApiConfig, nativeConfig, serverController);
-    if (result.errorCode != ErrorCode::NoError) {
-        return result;
-    }
-
-    QStringList lines = nativeConfig.value(config_key::config).toString().replace("\r", "").split("\n");
-    for (const QString &line : std::as_const(lines)) {
-        result.config.append(line + "\n");
-    }
-
-    result.qrCodes << generateQrCode(result.config.toUtf8());
-    return result;
-}
-
-ExportConfigResult ExportController::generateAwgConfig(const QString &clientName,
-                                                    const ServerCredentials &credentials,
-                                                    const ContainerConfig &containerConfig,
-                                                    const QPair<QString, QString> &dnsSettings,
-                                                    bool isApiConfig)
-{
-    ExportConfigResult result;
-    QJsonObject nativeConfig;
-    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
-
-    result.errorCode = generateNativeConfig(DockerContainer::Awg, clientName, Proto::Awg, 
-                                           credentials, containerConfig, dnsSettings, isApiConfig, nativeConfig, serverController);
-    if (result.errorCode != ErrorCode::NoError) {
-        return result;
-    }
-
-    QStringList lines = nativeConfig.value(config_key::config).toString().replace("\r", "").split("\n");
-    for (const QString &line : std::as_const(lines)) {
-        result.config.append(line + "\n");
-    }
-
-    result.qrCodes << generateQrCode(result.config.toUtf8());
-    return result;
-}
-
-ExportConfigResult ExportController::generateShadowSocksConfig(const ServerCredentials &credentials,
-                                                            const DockerContainer container,
-                                                            const ContainerConfig &containerConfig,
-                                                            const QPair<QString, QString> &dnsSettings,
-                                                            bool isApiConfig)
-{
-    ExportConfigResult result;
-    QJsonObject nativeConfig;
-    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
-
-    Proto protocol = Proto::ShadowSocks;
-    if (container == DockerContainer::Cloak) {
-        protocol = Proto::ShadowSocks;
-    } else {
-        protocol = ContainerProps::defaultProtocol(container);
-    }
-
-    result.errorCode = generateNativeConfig(container, "", protocol, credentials, 
-                                           containerConfig, dnsSettings, isApiConfig, nativeConfig, serverController);
-    if (result.errorCode != ErrorCode::NoError) {
-        return result;
-    }
-
-    QStringList lines = QString(QJsonDocument(nativeConfig).toJson()).replace("\r", "").split("\n");
-    for (const QString &line : std::as_const(lines)) {
-        result.config.append(line + "\n");
-    }
-
-    result.nativeConfigString = QString("%1:%2@%3:%4")
-                                       .arg(nativeConfig.value("method").toString(), 
-                                            nativeConfig.value("password").toString(),
-                                            nativeConfig.value("server").toString(), 
-                                            nativeConfig.value("server_port").toString());
-
-    result.nativeConfigString = "ss://" + result.nativeConfigString.toUtf8().toBase64();
-    result.qrCodes << generateQrCode(result.nativeConfigString.toUtf8());
-
-    return result;
-}
-
-ExportConfigResult ExportController::generateCloakConfig(const ServerCredentials &credentials,
-                                                      const ContainerConfig &containerConfig,
-                                                      const QPair<QString, QString> &dnsSettings,
-                                                      bool isApiConfig)
-{
-    ExportConfigResult result;
-    QJsonObject nativeConfig;
-    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
-
-    result.errorCode = generateNativeConfig(DockerContainer::Cloak, "", Proto::Cloak, 
-                                           credentials, containerConfig, dnsSettings, isApiConfig, nativeConfig, serverController);
-    if (result.errorCode != ErrorCode::NoError) {
-        return result;
-    }
-
-    nativeConfig.remove(config_key::transport_proto);
-    nativeConfig.insert("ProxyMethod", "shadowsocks");
-
-    QStringList lines = QString(QJsonDocument(nativeConfig).toJson()).replace("\r", "").split("\n");
-    for (const QString &line : std::as_const(lines)) {
-        result.config.append(line + "\n");
-    }
-
-    return result;
-}
-
-ExportConfigResult ExportController::generateXrayConfig(const QString &clientName,
-                                                     const ServerCredentials &credentials,
-                                                     const ContainerConfig &containerConfig,
-                                                     const QPair<QString, QString> &dnsSettings,
-                                                     bool isApiConfig)
-{
-    ExportConfigResult result;
-    QJsonObject nativeConfig;
-    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
-
-    result.errorCode = generateNativeConfig(DockerContainer::Xray, clientName, Proto::Xray, 
-                                           credentials, containerConfig, dnsSettings, isApiConfig, nativeConfig, serverController);
-    if (result.errorCode != ErrorCode::NoError) {
-        return result;
-    }
-
-    QStringList lines = QString(QJsonDocument(nativeConfig).toJson()).replace("\r", "").split("\n");
-    for (const QString &line : std::as_const(lines)) {
-        result.config.append(line + "\n");
-    }
-
-    return result;
-}
-
-
-
-ErrorCode ExportController::generateNativeConfig(const DockerContainer container, const QString &clientName, 
-                                                 const Proto &protocol, const ServerCredentials &credentials,
-                                                 const ContainerConfig &containerConfig, const QPair<QString, QString> &dnsSettings,
-                                                 bool isApiConfig, QJsonObject &jsonNativeConfig,
-                                                 const QSharedPointer<ServerController> &serverController)
-{
-    VpnConfigurationsController vpnConfigurationController(m_settings, serverController);
-
-    // Use the provided ContainerConfig directly
-    ContainerConfig modifiedContainerConfig = containerConfig;
-
-    QString protocolConfigString;
-    ErrorCode errorCode = vpnConfigurationController.createProtocolConfigString(isApiConfig, dnsSettings, credentials, 
-                                                                                container, modifiedContainerConfig,
-                                                                                protocol, protocolConfigString);
-    if (errorCode != ErrorCode::NoError) {
-        return errorCode;
-    }
-
-    jsonNativeConfig = QJsonDocument::fromJson(protocolConfigString.toUtf8()).object();
-
-    if (protocol == Proto::OpenVpn || protocol == Proto::WireGuard || protocol == Proto::Awg || protocol == Proto::Xray) {
-        QString protocolName = ProtocolProps::protoToString(protocol);
-        auto protocolConfig = modifiedContainerConfig.protocolConfigs.value(protocolName);
-        
-        m_waitingForNativeConfigAppend = true;
-        emit nativeConfigClientAppendRequested(protocolConfig, clientName, container, credentials, serverController);
-        
-        QEventLoop loop;
-        QTimer timer;
-        timer.setSingleShot(true);
-        timer.setInterval(30000);
-        
-        connect(this, &ExportController::onNativeConfigClientAppendCompleted, &loop, &QEventLoop::quit);
-        connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
-        
-        timer.start();
-        loop.exec();
-        
-        m_waitingForNativeConfigAppend = false;
-        errorCode = m_lastNativeConfigAppendResult;
-    }
-    
-    return errorCode;
-}
-
-void ExportController::onClientAppendCompleted(ErrorCode errorCode)
-{
-    if (m_waitingForClientAppend) {
-        m_lastClientAppendResult = errorCode;
-    }
-}
-
-void ExportController::onNativeConfigClientAppendCompleted(ErrorCode errorCode)
-{
-    if (m_waitingForNativeConfigAppend) {
-        m_lastNativeConfigAppendResult = errorCode;
-    }
-}
-
-QList<QString> ExportController::generateQrCodeSeries(const QByteArray &data)
-{
-    return qrCodeUtils::generateQrCodeImageSeries(data);
-}
-
-QString ExportController::generateQrCode(const QByteArray &data)
-{
-    auto qr = qrCodeUtils::generateQrCode(data);
-    return qrCodeUtils::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
-} 
--- a/client/core/controllers/selfhosted/exportController.h
+++ b/client/core/controllers/selfhosted/exportController.h
@@ -1,117 +0,0 @@
-#ifndef EXPORT_CORE_CONTROLLER_H
-#define EXPORT_CORE_CONTROLLER_H
-
-#include <QObject>
-#include <QSharedPointer>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QList>
-#include <QString>
-
-#include "core/defs.h"
-#include "core/models/containers/containers_defs.h"
-#include "core/models/containers/containerConfig.h"
-#include "core/models/protocols/protocolConfig.h"
-#include "core/models/servers/serverConfig.h"
-
-class ServerController;
-class Settings;
-
-using namespace amnezia;
-
-struct ExportConfigResult
-{
-    QString config;
-    QString nativeConfigString;
-    QList<QString> qrCodes;
-    ErrorCode errorCode;
-};
-
-class ExportController : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit ExportController(std::shared_ptr<Settings> settings, 
-                              QObject *parent = nullptr);
-
-signals:
-    void clientAppendRequested(const DockerContainer container, const ServerCredentials &credentials, 
-                              const ContainerConfig &containerConfig, const QString &clientName, 
-                              const QSharedPointer<ServerController> &serverController);
-    
-    void nativeConfigClientAppendRequested(const QSharedPointer<ProtocolConfig> &protocolConfig, const QString &clientName, 
-                                          const DockerContainer container, const ServerCredentials &credentials, 
-                                          const QSharedPointer<ServerController> &serverController);
-
-    void configGenerated(const ExportConfigResult &result);
-    void clientManagementError(ErrorCode errorCode);
-
-public slots:
-    void onClientAppendCompleted(ErrorCode errorCode);
-    void onNativeConfigClientAppendCompleted(ErrorCode errorCode);
-
-    ExportConfigResult generateFullAccessConfig(const QSharedPointer<ServerConfig> &serverConfig);
-    
-    ExportConfigResult generateConnectionConfig(const QString &clientName, 
-                                               const ServerCredentials &credentials,
-                                               const DockerContainer container,
-                                               const ContainerConfig &containerConfig,
-                                               const QSharedPointer<ServerConfig> &serverConfig,
-                                               const QPair<QString, QString> &dnsSettings);
-    
-    ExportConfigResult generateOpenVpnConfig(const QString &clientName,
-                                            const ServerCredentials &credentials,
-                                            const DockerContainer container,
-                                            const ContainerConfig &containerConfig,
-                                            const QPair<QString, QString> &dnsSettings,
-                                            bool isApiConfig = false);
-    
-    ExportConfigResult generateWireGuardConfig(const QString &clientName,
-                                              const ServerCredentials &credentials,
-                                              const ContainerConfig &containerConfig,
-                                              const QPair<QString, QString> &dnsSettings,
-                                              bool isApiConfig = false);
-    
-    ExportConfigResult generateAwgConfig(const QString &clientName,
-                                        const ServerCredentials &credentials,
-                                        const ContainerConfig &containerConfig,
-                                        const QPair<QString, QString> &dnsSettings,
-                                        bool isApiConfig = false);
-    
-    ExportConfigResult generateShadowSocksConfig(const ServerCredentials &credentials,
-                                                const DockerContainer container,
-                                                const ContainerConfig &containerConfig,
-                                                const QPair<QString, QString> &dnsSettings,
-                                                bool isApiConfig = false);
-    
-    ExportConfigResult generateCloakConfig(const ServerCredentials &credentials,
-                                          const ContainerConfig &containerConfig,
-                                          const QPair<QString, QString> &dnsSettings,
-                                          bool isApiConfig = false);
-    
-    ExportConfigResult generateXrayConfig(const QString &clientName,
-                                         const ServerCredentials &credentials,
-                                         const ContainerConfig &containerConfig,
-                                         const QPair<QString, QString> &dnsSettings,
-                                         bool isApiConfig = false);
-
-private:
-    ErrorCode generateNativeConfig(const DockerContainer container, const QString &clientName, 
-                                  const Proto &protocol, const ServerCredentials &credentials,
-                                  const ContainerConfig &containerConfig, const QPair<QString, QString> &dnsSettings,
-                                  bool isApiConfig, QJsonObject &jsonNativeConfig,
-                                  const QSharedPointer<ServerController> &serverController);
-    
-    QList<QString> generateQrCodeSeries(const QByteArray &data);
-    QString generateQrCode(const QByteArray &data);
-    
-    std::shared_ptr<Settings> m_settings;
-    
-    ErrorCode m_lastClientAppendResult;
-    ErrorCode m_lastNativeConfigAppendResult;
-    bool m_waitingForClientAppend;
-    bool m_waitingForNativeConfigAppend;
-};
-
-#endif // EXPORT_CORE_CONTROLLER_H 
--- a/client/core/controllers/selfhosted/installController.cpp
+++ b/client/core/controllers/selfhosted/installController.cpp
@@ -1,397 +0,0 @@
-#include "installController.h"
-
-#include <QDesktopServices>
-#include <QDir>
-#include <QEventLoop>
-#include <QJsonDocument>
-#include <QRandomGenerator>
-#include <QStandardPaths>
-#include <QtConcurrent>
-
-#include "core/api/apiUtils.h"
-#include "core/controllers/selfhosted/serverController.h"
-
-#include "core/controllers/vpnConfigurationController.h"
-#include "core/models/servers/selfHostedServerConfig.h"
-#include "core/models/protocols/awgProtocolConfig.h"
-#include "core/networkUtilities.h"
-#include "logger.h"
-#include "utilities.h"
-
-namespace
-{
-    Logger logger("CoreInstallController");
-}
-
-InstallController::InstallController(std::shared_ptr<Settings> settings,
-                                     QObject *parent)
-    : QObject(parent),
-      m_settings(settings)
-{
-}
-
-InstallResult InstallController::installContainer(DockerContainer container, int port, TransportProto transportProto,
-                                                  const ServerCredentials &serverCredentials, bool shouldCreateServer,
-                                                  const QString &privateKeyPassphrase)
-{
-    InstallResult result;
-    result.errorCode = ErrorCode::NoError;
-    result.isServiceInstall = (ContainerProps::containerService(container) == ServiceType::Other);
-    result.isInstalledContainerFound = false;
-
-    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
-
-    ContainerConfig containerConfig = generateContainerConfig(container, port, transportProto);
-
-    if (shouldCreateServer && isServerAlreadyExists(serverCredentials)) {
-        result.errorCode = ErrorCode::InternalError;
-        return result;
-    }
-
-    QMap<DockerContainer, ContainerConfig> installedContainers;
-    ErrorCode errorCode = getAlreadyInstalledContainers(serverCredentials, serverController, installedContainers);
-    if (errorCode != ErrorCode::NoError) {
-        result.errorCode = errorCode;
-        return result;
-    }
-
-    QSharedPointer<ServerConfig> serverConfig;
-    if (shouldCreateServer) {
-        errorCode = installServer(container, installedContainers, serverCredentials, 
-                                 serverController, result.message, serverConfig);
-    } else {
-        if (installedContainers.contains(container)) {
-            result.errorCode = ErrorCode::InternalError;
-            return result;
-        }
-
-        errorCode = installContainer(container, installedContainers, serverCredentials,
-                                    serverController, result.message);
-    }
-
-    if (errorCode != ErrorCode::NoError) {
-        result.errorCode = errorCode;
-        return result;
-    }
-
-    result.errorCode = ErrorCode::NoError;
-    return result;
-}
-
-InstallResult InstallController::scanServerForInstalledContainers(const ServerCredentials &serverCredentials)
-{
-    InstallResult result;
-    result.errorCode = ErrorCode::NoError;
-    result.isInstalledContainerFound = false;
-    result.isServiceInstall = false;
-
-    QMap<DockerContainer, ContainerConfig> installedContainers;
-    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
-    result.errorCode = getAlreadyInstalledContainers(serverCredentials, serverController, installedContainers);
-
-    if (result.errorCode == ErrorCode::NoError) {
-        VpnConfigurationsController vpnConfigurationController(m_settings, serverController);
-
-        for (auto iterator = installedContainers.begin(); iterator != installedContainers.end(); iterator++) {
-            auto container = iterator.key();
-            ContainerConfig containerConfig = iterator.value();
-
-            if (ContainerProps::isSupportedByCurrentPlatform(container)) {
-                result.errorCode = vpnConfigurationController.createProtocolConfigForContainer(serverCredentials, container, containerConfig);
-                if (result.errorCode != ErrorCode::NoError) {
-                    return result;
-                }
-
-                emit clientAppendRequested(container, serverCredentials, containerConfig,
-                                          QString("Admin [%1]").arg(QSysInfo::prettyProductName()),
-                                          serverController);
-            }
-
-            result.isInstalledContainerFound = true;
-        }
-    }
-
-    return result;
-}
-
-ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentials &credentials,
-                                                          const QSharedPointer<ServerController> &serverController,
-                                                          QMap<DockerContainer, ContainerConfig> &installedContainers)
-{
-    QString stdOut;
-    auto cbReadStdOut = [&](const QString &data, libssh::Client &) {
-        stdOut += data + "\n";
-        return ErrorCode::NoError;
-    };
-    auto cbReadStdErr = [&](const QString &data, libssh::Client &) {
-        stdOut += data + "\n";
-        return ErrorCode::NoError;
-    };
-
-    QString script = QString("sudo docker ps --format '{{.Names}} {{.Ports}}'");
-
-    ErrorCode errorCode = serverController->runScript(credentials, script, cbReadStdOut, cbReadStdErr);
-    if (errorCode != ErrorCode::NoError) {
-        return errorCode;
-    }
-
-    auto containersInfo = stdOut.split("\n");
-    for (auto &containerInfo : containersInfo) {
-        if (containerInfo.isEmpty()) {
-            continue;
-        }
-        const static QRegularExpression containerAndPortRegExp("(amnezia[-a-z0-9]*).*?:([0-9]*)->[0-9]*/(udp|tcp).*");
-        QRegularExpressionMatch containerAndPortMatch = containerAndPortRegExp.match(containerInfo);
-        if (containerAndPortMatch.hasMatch()) {
-            QString containerName = containerAndPortMatch.captured(1);
-            QString port = containerAndPortMatch.captured(2);
-            QString transportProto = containerAndPortMatch.captured(3);
-
-            DockerContainer container = ContainerProps::containerFromString(containerName);
-            if (container != DockerContainer::None) {
-                ContainerConfig containerConfig;
-                containerConfig.containerName = ContainerProps::containerToString(container);
-
-                auto containerProto = ContainerProps::defaultProtocol(container);
-                auto containerProtoString = ProtocolProps::protoToString(containerProto);
-
-                // Create appropriate protocol config based on container type
-                QSharedPointer<ProtocolConfig> protocolConfig;
-                
-                // Create a temporary QJsonObject to construct the protocol config
-                QJsonObject protoConfigObject;
-                protoConfigObject.insert(config_key::port, port);
-                protoConfigObject.insert(config_key::transport_proto, transportProto);
-                
-                // Create the appropriate protocol config based on type
-                switch (containerProto) {
-                case Proto::OpenVpn:
-                    protocolConfig = QSharedPointer<OpenVpnProtocolConfig>::create(protoConfigObject, containerProtoString);
-                    break;
-                case Proto::WireGuard:
-                    protocolConfig = QSharedPointer<WireGuardProtocolConfig>::create(protoConfigObject, containerProtoString);
-                    break;
-                case Proto::Awg:
-                    protocolConfig = QSharedPointer<AwgProtocolConfig>::create(protoConfigObject, containerProtoString);
-                    break;
-                case Proto::Cloak:
-                    protocolConfig = QSharedPointer<CloakProtocolConfig>::create(protoConfigObject, containerProtoString);
-                    break;
-                case Proto::ShadowSocks:
-                    protocolConfig = QSharedPointer<ShadowsocksProtocolConfig>::create(protoConfigObject, containerProtoString);
-                    break;
-                case Proto::Xray:
-                case Proto::SSXray:
-                    protocolConfig = QSharedPointer<XrayProtocolConfig>::create(protoConfigObject, containerProtoString);
-                    break;
-                case Proto::Ikev2:
-                    protocolConfig = QSharedPointer<Ikev2ProtocolConfig>::create(protoConfigObject, containerProtoString);
-                    break;
-                case Proto::Sftp:
-                    protocolConfig = QSharedPointer<SftpProtocolConfig>::create(protoConfigObject, containerProtoString);
-                    break;
-                case Proto::Socks5Proxy:
-                    protocolConfig = QSharedPointer<Socks5ProtocolConfig>::create(protoConfigObject, containerProtoString);
-                    break;
-                default:
-                    continue; // Skip unknown protocols
-                }
-                
-                if (protocolConfig) {
-                    containerConfig.protocolConfigs.insert(containerProtoString, protocolConfig);
-                    installedContainers.insert(container, containerConfig);
-                }
-            }
-        }
-    }
-
-    return ErrorCode::NoError;
-}
-
-ErrorCode InstallController::installServer(const DockerContainer container,
-                                          const QMap<DockerContainer, ContainerConfig> &installedContainers,
-                                          const ServerCredentials &serverCredentials,
-                                          const QSharedPointer<ServerController> &serverController,
-                                          QString &finishMessage, QSharedPointer<ServerConfig> &serverConfig)
-{
-    if (installedContainers.size() > 1) {
-        finishMessage += tr("\nAdded containers that were already installed on the server");
-    }
-
-    // Create a SelfHostedServerConfig and populate it properly
-    serverConfig = QSharedPointer<SelfHostedServerConfig>::create(QJsonObject());
-    auto selfHostedConfig = qSharedPointerCast<SelfHostedServerConfig>(serverConfig);
-    
-    selfHostedConfig->hostName = serverCredentials.hostName;
-    selfHostedConfig->serverCredentials = serverCredentials;
-    selfHostedConfig->name = m_settings->nextAvailableServerName();
-    selfHostedConfig->defaultContainer = ContainerProps::containerToString(container);
-    selfHostedConfig->type = amnezia::ServerConfigType::SelfHosted;
-
-    VpnConfigurationsController vpnConfigurationController(m_settings, serverController);
-    
-    for (auto iterator = installedContainers.begin(); iterator != installedContainers.end(); iterator++) {
-        auto containerConfig = iterator.value();
-        QString containerName = ContainerProps::containerToString(iterator.key());
-
-        if (ContainerProps::isSupportedByCurrentPlatform(iterator.key())) {
-            auto errorCode = vpnConfigurationController.createProtocolConfigForContainer(serverCredentials, iterator.key(),
-                                                                                         containerConfig);
-            if (errorCode != ErrorCode::NoError) {
-                return errorCode;
-            }
-        }
-        
-        selfHostedConfig->containerConfigs.insert(containerName, containerConfig);
-    }
-
-    int serverIndex = m_settings->nextAvailableServerIndex();
-    m_settings->setServerConfig(serverIndex, serverConfig->toJson());
-    m_settings->setDefaultServerIndex(serverIndex);
-
-    finishMessage = tr("Server '%1' was successfully added").arg(serverCredentials.hostName);
-    return ErrorCode::NoError;
-}
-
-ErrorCode InstallController::installContainer(const DockerContainer container,
-                                           const QMap<DockerContainer, ContainerConfig> &installedContainers,
-                                           const ServerCredentials &serverCredentials,
-                                           const QSharedPointer<ServerController> &serverController,
-                                           QString &finishMessage)
-{
-    bool isInstalledContainerAddedToGui = false;
-
-    VpnConfigurationsController vpnConfigurationController(m_settings, serverController);
-    QList<QJsonObject> allContainerConfigs;
-    
-    for (auto iterator = installedContainers.begin(); iterator != installedContainers.end(); iterator++) {
-        QJsonObject containerConfig = iterator.value();
-
-        if (ContainerProps::isSupportedByCurrentPlatform(container)) {
-            auto errorCode = vpnConfigurationController.createProtocolConfigForContainer(serverCredentials, iterator.key(), containerConfig);
-            if (errorCode != ErrorCode::NoError) {
-                return errorCode;
-            }
-            allContainerConfigs.append(containerConfig);
-        } else {
-            allContainerConfigs.append(containerConfig);
-        }
-
-        if (container != iterator.key()) {
-            isInstalledContainerAddedToGui = true;
-        }
-    }
-    
-    if (isInstalledContainerAddedToGui) {
-        finishMessage += tr("\nAlready installed containers were found on the server. "
-                           "All installed containers have been added to the application");
-    }
-
-    finishMessage = tr("Container '%1' was successfully added").arg(ContainerProps::containerHumanNames().value(container));
-    return ErrorCode::NoError;
-}
-
-bool InstallController::isServerAlreadyExists(const ServerCredentials &serverCredentials) const
-{
-    for (int i = 0; i < m_settings->serversCount(); i++) {
-        QJsonObject serverConfig = m_settings->serverConfig(i);
-        ServerCredentials existingCredentials = ServerCredentials::fromServerConfig(serverConfig);
-        if (serverCredentials.hostName == existingCredentials.hostName && 
-            serverCredentials.port == existingCredentials.port) {
-            return true;
-        }
-    }
-    return false;
-}
-
-ContainerConfig InstallController::generateContainerConfig(const DockerContainer container, int port,
-                                                           const TransportProto transportProto)
-{
-    ContainerConfig containerConfig;
-    containerConfig.containerName = ContainerProps::containerToString(container);
-    
-    auto mainProto = ContainerProps::defaultProtocol(container);
-    for (auto protocol : ContainerProps::protocolsForContainer(container)) {
-        QSharedPointer<ProtocolConfig> protocolConfig;
-        
-        if (protocol == mainProto) {
-            // Create the appropriate protocol config based on the protocol type
-            if (protocol == Proto::Awg && container == DockerContainer::Awg) {
-                // Use the VpnConfigurationsController to create proper AwgProtocolConfig
-                // For now, create a basic protocol config and set values
-                protocolConfig = QSharedPointer<AwgProtocolConfig>::create(QJsonObject(), ProtocolProps::protoToString(protocol));
-                auto awgConfig = qSharedPointerCast<AwgProtocolConfig>(protocolConfig);
-                
-                // Set server protocol config
-                awgConfig->serverProtocolConfig.port = QString::number(port);
-                awgConfig->serverProtocolConfig.transportProto = ProtocolProps::transportProtoToString(transportProto, protocol);
-                
-                // Generate AWG-specific parameters
-                awgConfig->serverProtocolConfig.junkPacketCount = QString::number(QRandomGenerator::global()->bounded(2, 5));
-                awgConfig->serverProtocolConfig.junkPacketMinSize = QString::number(10);
-                awgConfig->serverProtocolConfig.junkPacketMaxSize = QString::number(50);
-                
-                int s1 = QRandomGenerator::global()->bounded(15, 150);
-                int s2 = QRandomGenerator::global()->bounded(15, 150);
-                QSet<int> usedValues;
-                usedValues.insert(s1);
-                while (usedValues.contains(s2) || s1 + AwgConstant::messageInitiationSize == s2 + AwgConstant::messageResponseSize) {
-                    s2 = QRandomGenerator::global()->bounded(15, 150);
-                }
-                usedValues.insert(s2);
-                
-                awgConfig->serverProtocolConfig.initPacketJunkSize = QString::number(s1);
-                awgConfig->serverProtocolConfig.responsePacketJunkSize = QString::number(s2);
-                
-                QSet<QString> headersValue;
-                while (headersValue.size() != 4) {
-                    auto max = (std::numeric_limits<qint32>::max)();
-                    headersValue.insert(QString::number(QRandomGenerator::global()->bounded(5, max)));
-                }
-                auto headersValueList = headersValue.values();
-                awgConfig->serverProtocolConfig.initPacketMagicHeader = headersValueList.at(0);
-                awgConfig->serverProtocolConfig.responsePacketMagicHeader = headersValueList.at(1);
-                awgConfig->serverProtocolConfig.underloadPacketMagicHeader = headersValueList.at(2);
-                awgConfig->serverProtocolConfig.transportPacketMagicHeader = headersValueList.at(3);
-                
-            } else {
-                // For other protocols, create basic protocol configs
-                // This will need to be expanded for each protocol type
-                protocolConfig = QSharedPointer<ProtocolConfig>::create(QJsonObject(), ProtocolProps::protoToString(protocol));
-                
-                // For now, store basic port and transport info as JSON until all protocol configs are properly structured
-                QJsonObject tempConfig;
-                tempConfig.insert(config_key::port, QString::number(port));
-                tempConfig.insert(config_key::transport_proto, ProtocolProps::transportProtoToString(transportProto, protocol));
-                
-                if (container == DockerContainer::Sftp) {
-                    tempConfig.insert(config_key::userName, protocols::sftp::defaultUserName);
-                    tempConfig.insert(config_key::password, Utils::getRandomString(16));
-                } else if (container == DockerContainer::Socks5Proxy) {
-                    tempConfig.insert(config_key::userName, protocols::socks5Proxy::defaultUserName);
-                    tempConfig.insert(config_key::password, Utils::getRandomString(16));
-                }
-                
-                // Store this in the protocol config's internal JSON for now
-                // TODO: Replace with proper protocol config structure
-                protocolConfig = QSharedPointer<ProtocolConfig>::create(tempConfig, ProtocolProps::protoToString(protocol));
-            }
-        } else {
-            // Non-main protocols get basic configs
-            protocolConfig = QSharedPointer<ProtocolConfig>::create(QJsonObject(), ProtocolProps::protoToString(protocol));
-        }
-        
-        containerConfig.protocolConfigs.insert(ProtocolProps::protoToString(protocol), protocolConfig);
-    }
-    
-    return containerConfig;
-} 
-
-ErrorCode InstallController::checkSshConnection(const ServerCredentials &serverCredentials, const QString &privateKeyPassphrase)
-{
-    Q_UNUSED(privateKeyPassphrase);
-    QSharedPointer<ServerController> serverController(new ServerController(m_settings));
-    ErrorCode errorCode = ErrorCode::NoError;
-    serverController->checkSshConnection(serverCredentials, errorCode);
-    return errorCode;
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pokamest Nikak	2c492f4033	wip	2024-09-19 14:28:06 +01:00
pokamest	471958479e	WIP	2024-09-19 06:24:43 -07:00