diff --git a/api/models/authentication/ForgotPasswordForm.php b/api/models/authentication/ForgotPasswordForm.php
index 407d5fc..1c0b0d3 100644
--- a/api/models/authentication/ForgotPasswordForm.php
+++ b/api/models/authentication/ForgotPasswordForm.php
@@ -1,7 +1,7 @@
 <?php
 namespace api\models\authentication;
 
-use api\emails\EmailHelper;
+use common\emails\EmailHelper;
 use api\models\base\ApiForm;
 use api\validators\TotpValidator;
 use common\helpers\Error as E;
diff --git a/api/models/authentication/RegistrationForm.php b/api/models/authentication/RegistrationForm.php
index 95db013..40fb293 100644
--- a/api/models/authentication/RegistrationForm.php
+++ b/api/models/authentication/RegistrationForm.php
@@ -2,7 +2,7 @@
 namespace api\models\authentication;
 
 use api\components\ReCaptcha\Validator as ReCaptchaValidator;
-use api\emails\EmailHelper;
+use common\emails\EmailHelper;
 use api\models\base\ApiForm;
 use common\helpers\Error as E;
 use common\components\UserFriendlyRandomKey;
diff --git a/api/models/authentication/RepeatAccountActivationForm.php b/api/models/authentication/RepeatAccountActivationForm.php
index 9a7e525..a687052 100644
--- a/api/models/authentication/RepeatAccountActivationForm.php
+++ b/api/models/authentication/RepeatAccountActivationForm.php
@@ -2,7 +2,7 @@
 namespace api\models\authentication;
 
 use api\components\ReCaptcha\Validator as ReCaptchaValidator;
-use api\emails\EmailHelper;
+use common\emails\EmailHelper;
 use api\models\base\ApiForm;
 use common\helpers\Error as E;
 use common\components\UserFriendlyRandomKey;
diff --git a/api/models/profile/ChangeEmail/InitStateForm.php b/api/models/profile/ChangeEmail/InitStateForm.php
index 680d45c..217415f 100644
--- a/api/models/profile/ChangeEmail/InitStateForm.php
+++ b/api/models/profile/ChangeEmail/InitStateForm.php
@@ -1,7 +1,7 @@
 <?php
 namespace api\models\profile\ChangeEmail;
 
-use api\emails\EmailHelper;
+use common\emails\EmailHelper;
 use api\models\base\ApiForm;
 use api\validators\PasswordRequiredValidator;
 use common\helpers\Error as E;
diff --git a/api/models/profile/ChangeEmail/NewEmailForm.php b/api/models/profile/ChangeEmail/NewEmailForm.php
index 907ac3c..ba67dfc 100644
--- a/api/models/profile/ChangeEmail/NewEmailForm.php
+++ b/api/models/profile/ChangeEmail/NewEmailForm.php
@@ -1,7 +1,7 @@
 <?php
 namespace api\models\profile\ChangeEmail;
 
-use api\emails\EmailHelper;
+use common\emails\EmailHelper;
 use api\models\base\ApiForm;
 use api\validators\EmailActivationKeyValidator;
 use common\models\Account;
diff --git a/api/emails/EmailHelper.php b/common/emails/EmailHelper.php
similarity index 84%
rename from api/emails/EmailHelper.php
rename to common/emails/EmailHelper.php
index 17bb67b..2d40cb3 100644
--- a/api/emails/EmailHelper.php
+++ b/common/emails/EmailHelper.php
@@ -1,12 +1,12 @@
 <?php
-namespace api\emails;
+namespace common\emails;
 
-use api\emails\templates\ChangeEmailConfirmCurrentEmail;
-use api\emails\templates\ChangeEmailConfirmNewEmail;
-use api\emails\templates\ForgotPasswordEmail;
-use api\emails\templates\ForgotPasswordParams;
-use api\emails\templates\RegistrationEmail;
-use api\emails\templates\RegistrationEmailParams;
+use common\emails\templates\ChangeEmailConfirmCurrentEmail;
+use common\emails\templates\ChangeEmailConfirmNewEmail;
+use common\emails\templates\ForgotPasswordEmail;
+use common\emails\templates\ForgotPasswordParams;
+use common\emails\templates\RegistrationEmail;
+use common\emails\templates\RegistrationEmailParams;
 use common\models\Account;
 use common\models\confirmations\CurrentEmailConfirmation;
 use common\models\confirmations\ForgotPassword;
diff --git a/api/emails/Template.php b/common/emails/Template.php
similarity index 95%
rename from api/emails/Template.php
rename to common/emails/Template.php
index c4aa1e9..6637421 100644
--- a/api/emails/Template.php
+++ b/common/emails/Template.php
@@ -1,7 +1,7 @@
 <?php
-namespace api\emails;
+namespace common\emails;
 
-use api\emails\exceptions\CannotSendEmailException;
+use common\emails\exceptions\CannotSendEmailException;
 use Yii;
 use yii\base\InvalidConfigException;
 use yii\mail\MailerInterface;
diff --git a/api/emails/TemplateWithRenderer.php b/common/emails/TemplateWithRenderer.php
similarity index 98%
rename from api/emails/TemplateWithRenderer.php
rename to common/emails/TemplateWithRenderer.php
index c3e3a57..0e0817f 100644
--- a/api/emails/TemplateWithRenderer.php
+++ b/common/emails/TemplateWithRenderer.php
@@ -1,5 +1,5 @@
 <?php
-namespace api\emails;
+namespace common\emails;
 
 use common\components\EmailRenderer;
 use Yii;
diff --git a/api/emails/exceptions/CannotSendEmailException.php b/common/emails/exceptions/CannotSendEmailException.php
similarity index 68%
rename from api/emails/exceptions/CannotSendEmailException.php
rename to common/emails/exceptions/CannotSendEmailException.php
index 0e9c37f..f893d22 100644
--- a/api/emails/exceptions/CannotSendEmailException.php
+++ b/common/emails/exceptions/CannotSendEmailException.php
@@ -1,5 +1,5 @@
 <?php
-namespace api\emails\exceptions;
+namespace common\emails\exceptions;
 
 use Exception;
 
diff --git a/api/emails/templates/ChangeEmailConfirmCurrentEmail.php b/common/emails/templates/ChangeEmailConfirmCurrentEmail.php
similarity index 74%
rename from api/emails/templates/ChangeEmailConfirmCurrentEmail.php
rename to common/emails/templates/ChangeEmailConfirmCurrentEmail.php
index dbfc176..f8779bb 100644
--- a/api/emails/templates/ChangeEmailConfirmCurrentEmail.php
+++ b/common/emails/templates/ChangeEmailConfirmCurrentEmail.php
@@ -1,7 +1,7 @@
 <?php
-namespace api\emails\templates;
+namespace common\emails\templates;
 
-use api\emails\Template;
+use common\emails\Template;
 
 class ChangeEmailConfirmCurrentEmail extends Template {
 
@@ -21,8 +21,8 @@ class ChangeEmailConfirmCurrentEmail extends Template {
      */
     protected function getView() {
         return [
-            'html' => '@app/mails/current-email-confirmation-html',
-            'text' => '@app/mails/current-email-confirmation-text',
+            'html' => '@api/mails/current-email-confirmation-html',
+            'text' => '@api/mails/current-email-confirmation-text',
         ];
     }
 
diff --git a/api/emails/templates/ChangeEmailConfirmNewEmail.php b/common/emails/templates/ChangeEmailConfirmNewEmail.php
similarity index 77%
rename from api/emails/templates/ChangeEmailConfirmNewEmail.php
rename to common/emails/templates/ChangeEmailConfirmNewEmail.php
index 02ee338..10fec5f 100644
--- a/api/emails/templates/ChangeEmailConfirmNewEmail.php
+++ b/common/emails/templates/ChangeEmailConfirmNewEmail.php
@@ -1,7 +1,7 @@
 <?php
-namespace api\emails\templates;
+namespace common\emails\templates;
 
-use api\emails\Template;
+use common\emails\Template;
 
 class ChangeEmailConfirmNewEmail extends Template {
 
@@ -24,8 +24,8 @@ class ChangeEmailConfirmNewEmail extends Template {
      */
     protected function getView() {
         return [
-            'html' => '@app/mails/new-email-confirmation-html',
-            'text' => '@app/mails/new-email-confirmation-text',
+            'html' => '@api/mails/new-email-confirmation-html',
+            'text' => '@api/mails/new-email-confirmation-text',
         ];
     }
 
diff --git a/api/emails/templates/ForgotPasswordEmail.php b/common/emails/templates/ForgotPasswordEmail.php
similarity index 90%
rename from api/emails/templates/ForgotPasswordEmail.php
rename to common/emails/templates/ForgotPasswordEmail.php
index 1af0505..b4a03c3 100644
--- a/api/emails/templates/ForgotPasswordEmail.php
+++ b/common/emails/templates/ForgotPasswordEmail.php
@@ -1,7 +1,7 @@
 <?php
-namespace api\emails\templates;
+namespace common\emails\templates;
 
-use api\emails\TemplateWithRenderer;
+use common\emails\TemplateWithRenderer;
 
 class ForgotPasswordEmail extends TemplateWithRenderer {
 
diff --git a/api/emails/templates/ForgotPasswordParams.php b/common/emails/templates/ForgotPasswordParams.php
similarity index 93%
rename from api/emails/templates/ForgotPasswordParams.php
rename to common/emails/templates/ForgotPasswordParams.php
index c060fdf..c6dc6c1 100644
--- a/api/emails/templates/ForgotPasswordParams.php
+++ b/common/emails/templates/ForgotPasswordParams.php
@@ -1,5 +1,5 @@
 <?php
-namespace api\emails\templates;
+namespace common\emails\templates;
 
 class ForgotPasswordParams {
 
diff --git a/api/emails/templates/RegistrationEmail.php b/common/emails/templates/RegistrationEmail.php
similarity index 90%
rename from api/emails/templates/RegistrationEmail.php
rename to common/emails/templates/RegistrationEmail.php
index 1e065f2..1ad0535 100644
--- a/api/emails/templates/RegistrationEmail.php
+++ b/common/emails/templates/RegistrationEmail.php
@@ -1,7 +1,7 @@
 <?php
-namespace api\emails\templates;
+namespace common\emails\templates;
 
-use api\emails\TemplateWithRenderer;
+use common\emails\TemplateWithRenderer;
 
 class RegistrationEmail extends TemplateWithRenderer {
 
diff --git a/api/emails/templates/RegistrationEmailParams.php b/common/emails/templates/RegistrationEmailParams.php
similarity index 93%
rename from api/emails/templates/RegistrationEmailParams.php
rename to common/emails/templates/RegistrationEmailParams.php
index c64f3e9..b1c324c 100644
--- a/api/emails/templates/RegistrationEmailParams.php
+++ b/common/emails/templates/RegistrationEmailParams.php
@@ -1,5 +1,5 @@
 <?php
-namespace api\emails\templates;
+namespace common\emails\templates;
 
 class RegistrationEmailParams {