diff --git a/client/core/controllers/coreController.cpp b/client/core/controllers/coreController.cpp
index 551eb61f..a077d809 100644
--- a/client/core/controllers/coreController.cpp
+++ b/client/core/controllers/coreController.cpp
@@ -1,5 +1,7 @@
 #include "coreController.h"
 
+#include <QTranslator>
+
 #if defined(Q_OS_ANDROID)
     #include "core/installedAppsImageProvider.h"
     #include "platforms/android/android_controller.h"
diff --git a/client/core/controllers/coreController.h b/client/core/controllers/coreController.h
index c67c9ccc..1b725825 100644
--- a/client/core/controllers/coreController.h
+++ b/client/core/controllers/coreController.h
@@ -26,7 +26,7 @@
 #endif
 #include "ui/models/api/apiAccountInfoModel.h"
 #include "ui/models/api/apiServicesModel.h"
-#include "ui/models/apiCountryModel.h"
+#include "ui/models/api/apiCountryModel.h"
 #include "ui/models/appSplitTunnelingModel.h"
 #include "ui/models/clientManagementModel.h"
 #include "ui/models/protocols/awgConfigModel.h"
diff --git a/client/core/controllers/gatewayController.cpp b/client/core/controllers/gatewayController.cpp
index 268561ae..d7a4b018 100644
--- a/client/core/controllers/gatewayController.cpp
+++ b/client/core/controllers/gatewayController.cpp
@@ -1,5 +1,8 @@
 #include "gatewayController.h"
 
+#include <algorithm>
+#include <random>
+
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
diff --git a/client/core/qrCodeUtils.cpp b/client/core/qrCodeUtils.cpp
index 02f43ff0..a18af172 100644
--- a/client/core/qrCodeUtils.cpp
+++ b/client/core/qrCodeUtils.cpp
@@ -3,7 +3,7 @@
 #include <QIODevice>
 #include <QList>
 
-QList<QString> qrCodeUtuls::generateQrCodeImageSeries(const QByteArray &data)
+QList<QString> qrCodeUtils::generateQrCodeImageSeries(const QByteArray &data)
 {
     double k = 850;
 
@@ -12,7 +12,7 @@ QList<QString> qrCodeUtuls::generateQrCodeImageSeries(const QByteArray &data)
     for (int i = 0; i < data.size(); i = i + k) {
         QByteArray chunk;
         QDataStream s(&chunk, QIODevice::WriteOnly);
-        s << qrCodeUtuls::qrMagicCode << chunksCount << (quint8)std::round(i / k) << data.mid(i, k);
+        s << qrCodeUtils::qrMagicCode << chunksCount << (quint8)std::round(i / k) << data.mid(i, k);
 
         QByteArray ba = chunk.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
 
@@ -24,12 +24,12 @@ QList<QString> qrCodeUtuls::generateQrCodeImageSeries(const QByteArray &data)
     return chunks;
 }
 
-QString qrCodeUtuls::svgToBase64(const QString &image)
+QString qrCodeUtils::svgToBase64(const QString &image)
 {
     return "data:image/svg;base64," + QString::fromLatin1(image.toUtf8().toBase64().data());
 }
 
-qrcodegen::QrCode qrCodeUtuls::generateQrCode(const QByteArray &data)
+qrcodegen::QrCode qrCodeUtils::generateQrCode(const QByteArray &data)
 {
     return qrcodegen::QrCode::encodeText(data, qrcodegen::QrCode::Ecc::LOW);
 }
diff --git a/client/core/qrCodeUtils.h b/client/core/qrCodeUtils.h
index f5f207c1..cda0723b 100644
--- a/client/core/qrCodeUtils.h
+++ b/client/core/qrCodeUtils.h
@@ -5,7 +5,7 @@
 
 #include "qrcodegen.hpp"
 
-namespace qrCodeUtuls
+namespace qrCodeUtils
 {
     constexpr const qint16 qrMagicCode = 1984;
 
diff --git a/client/ui/controllers/api/apiConfigsController.cpp b/client/ui/controllers/api/apiConfigsController.cpp
index 7085d9a2..33894e79 100644
--- a/client/ui/controllers/api/apiConfigsController.cpp
+++ b/client/ui/controllers/api/apiConfigsController.cpp
@@ -99,8 +99,8 @@ void ApiConfigsController::prepareVpnKeyExport()
 
     auto vpnKey = apiConfigObject.value(apiDefs::key::vpnKey).toString();
 
-    auto qr = qrCodeUtuls::generateQrCode(vpnKey.toUtf8());
-    m_qrCodes << qrCodeUtuls::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
+    auto qr = qrCodeUtils::generateQrCode(vpnKey.toUtf8());
+    m_qrCodes << qrCodeUtils::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
 
     emit vpnKeyExportReady();
 }
diff --git a/client/ui/controllers/api/apiSettingsController.h b/client/ui/controllers/api/apiSettingsController.h
index ae9d9126..5374e899 100644
--- a/client/ui/controllers/api/apiSettingsController.h
+++ b/client/ui/controllers/api/apiSettingsController.h
@@ -4,7 +4,7 @@
 #include <QObject>
 
 #include "ui/models/api/apiAccountInfoModel.h"
-#include "ui/models/apiCountryModel.h"
+#include "ui/models/api/apiCountryModel.h"
 #include "ui/models/servers_model.h"
 
 class ApiSettingsController : public QObject
diff --git a/client/ui/controllers/exportController.cpp b/client/ui/controllers/exportController.cpp
index 516d1f4d..b47111ae 100644
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -50,7 +50,7 @@ void ExportController::generateFullAccessConfig()
     compressedConfig = qCompress(compressedConfig, 8);
     m_config = QString("vpn://%1").arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals)));
 
-    m_qrCodes = qrCodeUtuls::generateQrCodeImageSeries(compressedConfig);
+    m_qrCodes = qrCodeUtils::generateQrCodeImageSeries(compressedConfig);
     emit exportConfigChanged();
 }
 
@@ -92,7 +92,7 @@ void ExportController::generateConnectionConfig(const QString &clientName)
     compressedConfig = qCompress(compressedConfig, 8);
     m_config = QString("vpn://%1").arg(QString(compressedConfig.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals)));
 
-    m_qrCodes = qrCodeUtuls::generateQrCodeImageSeries(compressedConfig);
+    m_qrCodes = qrCodeUtils::generateQrCodeImageSeries(compressedConfig);
     emit exportConfigChanged();
 }
 
@@ -149,7 +149,7 @@ void ExportController::generateOpenVpnConfig(const QString &clientName)
         m_config.append(line + "\n");
     }
 
-    m_qrCodes = qrCodeUtuls::generateQrCodeImageSeries(m_config.toUtf8());
+    m_qrCodes = qrCodeUtils::generateQrCodeImageSeries(m_config.toUtf8());
     emit exportConfigChanged();
 }
 
@@ -167,8 +167,8 @@ void ExportController::generateWireGuardConfig(const QString &clientName)
         m_config.append(line + "\n");
     }
 
-    auto qr = qrCodeUtuls::generateQrCode(m_config.toUtf8());
-    m_qrCodes << qrCodeUtuls::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
+    auto qr = qrCodeUtils::generateQrCode(m_config.toUtf8());
+    m_qrCodes << qrCodeUtils::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
 
     emit exportConfigChanged();
 }
@@ -187,8 +187,8 @@ void ExportController::generateAwgConfig(const QString &clientName)
         m_config.append(line + "\n");
     }
 
-    auto qr = qrCodeUtuls::generateQrCode(m_config.toUtf8());
-    m_qrCodes << qrCodeUtuls::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
+    auto qr = qrCodeUtils::generateQrCode(m_config.toUtf8());
+    m_qrCodes << qrCodeUtils::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
 
     emit exportConfigChanged();
 }
@@ -221,8 +221,8 @@ void ExportController::generateShadowSocksConfig()
 
     m_nativeConfigString = "ss://" + m_nativeConfigString.toUtf8().toBase64();
 
-    auto qr = qrCodeUtuls::generateQrCode(m_nativeConfigString.toUtf8());
-    m_qrCodes << qrCodeUtuls::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
+    auto qr = qrCodeUtils::generateQrCode(m_nativeConfigString.toUtf8());
+    m_qrCodes << qrCodeUtils::svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
 
     emit exportConfigChanged();
 }
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index c79b3288..178efc16 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -10,6 +10,7 @@
 #include "core/api/apiDefs.h"
 #include "core/api/apiUtils.h"
 #include "core/errorstrings.h"
+#include "core/qrCodeUtils.h"
 #include "core/serialization/serialization.h"
 #include "systemController.h"
 #include "utilities.h"
@@ -579,7 +580,7 @@ bool ImportController::parseQrCodeChunk(const QString &code)
     qint16 magic;
     s >> magic;
 
-    if (magic == amnezia::qrMagicCode) {
+    if (magic == qrCodeUtils::qrMagicCode) {
         quint8 chunksCount;
         s >> chunksCount;
         if (m_totalQrCodeChunksCount != chunksCount) {
diff --git a/client/ui/models/apiCountryModel.cpp b/client/ui/models/api/apiCountryModel.cpp
similarity index 93%
rename from client/ui/models/apiCountryModel.cpp
rename to client/ui/models/api/apiCountryModel.cpp
index 922a9d56..0043efd2 100644
--- a/client/ui/models/apiCountryModel.cpp
+++ b/client/ui/models/api/apiCountryModel.cpp
@@ -47,11 +47,11 @@ QVariant ApiCountryModel::data(const QModelIndex &index, int role) const
     return QVariant();
 }
 
-void ApiCountryModel::updateModel(const QJsonArray &data, const QString &currentCountryCode)
+void ApiCountryModel::updateModel(const QJsonArray &countries, const QString &currentCountryCode)
 {
     beginResetModel();
 
-    m_countries = data;
+    m_countries = countries;
     for (int i = 0; i < m_countries.size(); i++) {
         if (m_countries.at(i).toObject().value(configKey::serverCountryCode).toString() == currentCountryCode) {
             m_currentIndex = i;
diff --git a/client/ui/models/apiCountryModel.h b/client/ui/models/api/apiCountryModel.h
similarity index 91%
rename from client/ui/models/apiCountryModel.h
rename to client/ui/models/api/apiCountryModel.h
index b9e243d0..c935ebce 100644
--- a/client/ui/models/apiCountryModel.h
+++ b/client/ui/models/api/apiCountryModel.h
@@ -24,7 +24,7 @@ public:
     Q_PROPERTY(int currentIndex READ getCurrentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
 
 public slots:
-    void updateModel(const QJsonArray &data, const QString &currentCountryCode);
+    void updateModel(const QJsonArray &countries, const QString &currentCountryCode);
 
     int getCurrentIndex();
     void setCurrentIndex(const int i);