diff --git a/src/Managers/Account/Email/EmailManagerInterface.php b/src/Managers/Account/Email/EmailManagerInterface.php
index 4fa3776..57085e2 100644
--- a/src/Managers/Account/Email/EmailManagerInterface.php
+++ b/src/Managers/Account/Email/EmailManagerInterface.php
@@ -3,6 +3,8 @@ namespace Nilemin\Virtualmin\Managers\Account\Email;
 
 /**
  * @author Tsvetelin Tsonev <github.tsonev@yahoo.com>
+ *
+ **/
 interface EmailManagerInterface {
     /**
      * Creates email account.
diff --git a/src/Managers/Cron/CronManager.php b/src/Managers/Cron/CronManager.php
index 7b216c6..70fec06 100644
--- a/src/Managers/Cron/CronManager.php
+++ b/src/Managers/Cron/CronManager.php
@@ -1,13 +1,13 @@
 <?php
 namespace Nilemin\Virtualmin\Managers\Cron;
 
-use Nilemin\Virtualmin\BaseManager;
+use Nilemin\Virtualmin\Managers\BaseManager;
 use Nilemin\Virtualmin\Http\HttpClientInterface;
 
 /**
  * @author Tsvetelin Tsonev <github.tsonev@yahoo.com>
  */
-class CronManager extends BaseManager implements CronManagerInterface, CronManagerInterface {
+class CronManager extends BaseManager implements CronManagerInterface {
 
     /**
      * CronManager constructor.
diff --git a/src/Managers/DNS/DNSManager.php b/src/Managers/DNS/DNSManager.php
index 41f8b1a..1932e35 100644
--- a/src/Managers/DNS/DNSManager.php
+++ b/src/Managers/DNS/DNSManager.php
@@ -2,7 +2,8 @@
 namespace Nilemin\Virtualmin\Managers\DNS;
 
 use Nilemin\Virtualmin\Http\HttpClient;
-use Nilemin\Manager\BaseManager;
+use Nilemin\Virtualmin\Http\HttpClientInterface;
+use Nilemin\Virtualmin\Managers\BaseManager;
 use Nilet\Components\Configuration\Config;
 
 /**
@@ -38,7 +39,7 @@ class DNSManager extends BaseManager implements DNSManagerInterface {
      * @param HttpClient $httpClient
      * @param Config $config
      */
-    public function __construct(HttpClient $httpClient, Config $config) {
+    public function __construct(HttpClientInterface $httpClient, Config $config) {
         parent::__construct($httpClient, $config);
     }
 
diff --git a/src/Managers/Database/DatabaseManager.php b/src/Managers/Database/DatabaseManager.php
index 556b3dc..0b4a703 100644
--- a/src/Managers/Database/DatabaseManager.php
+++ b/src/Managers/Database/DatabaseManager.php
@@ -2,7 +2,7 @@
 namespace Nilemin\Virtualmin\Managers\Database;
 
 use Nilemin\Virtualmin\Http\HttpClientInterface;
-use Nilemin\Manager\BaseManager;
+use Nilemin\Virtualmin\Managers\BaseManager;
 use Nilemin\Virtualmin\Entities\Database;
 
 /**
diff --git a/src/Managers/PHP/PHPManager.php b/src/Managers/PHP/PHPManager.php
index 94b7b8e..01ecb01 100644
--- a/src/Managers/PHP/PHPManager.php
+++ b/src/Managers/PHP/PHPManager.php
@@ -2,13 +2,13 @@
 namespace Nilemin\Virtualmin\Managers\PHP;
 
 use Nilemin\Virtualmin\Http\HttpClientInterface;
-use Nilemin\Manager\BaseManager;
+use Nilemin\Virtualmin\Managers\BaseManager;
 use Nilemin\Virtualmin\Entities\PHPDirectory;
 
 /**
  * @author Tsvetelin Tsonev <github.tsonev@yahoo.com>
  */
-class PHPManager extends BaseManager implements PHPManagerInterface, PHPManagerInterface {
+class PHPManager extends BaseManager implements PHPManagerInterface {
 
     public function __construct(HttpClientInterface $httpClient) {
         parent::__construct($httpClient);
diff --git a/src/Managers/SSL/SSLManager.php b/src/Managers/SSL/SSLManager.php
index 0e50726..5715715 100644
--- a/src/Managers/SSL/SSLManager.php
+++ b/src/Managers/SSL/SSLManager.php
@@ -2,7 +2,7 @@
 namespace Nilemin\Virtualmin\Managers\SSL;
 
 use Nilemin\Virtualmin\Http\HttpClientInterface;
-use Nilemin\Manager\BaseManager;
+use Nilemin\Virtualmin\Managers\BaseManager;
 use Nilet\Components\FileSystem\IFile;
 
 /**
diff --git a/src/Managers/Scripts/ScriptsManager.php b/src/Managers/Scripts/ScriptsManager.php
index 6a53850..05c0dfe 100644
--- a/src/Managers/Scripts/ScriptsManager.php
+++ b/src/Managers/Scripts/ScriptsManager.php
@@ -2,7 +2,7 @@
 namespace Nilemin\Virtualmin\Managers\Scripts;
 
 use Nilemin\Virtualmin\Http\HttpClientInterface;
-use Nilemin\Manager\BaseManager;
+use Nilemin\Virtualmin\Managers\BaseManager;
 
 /**
  * @author Tsvetelin Tsonev <github.tsonev@yahoo.com>
diff --git a/src/Managers/Server/VirtualServerManager.php b/src/Managers/Server/VirtualServerManager.php
index bdcb69a..fe6ddb9 100644
--- a/src/Managers/Server/VirtualServerManager.php
+++ b/src/Managers/Server/VirtualServerManager.php
@@ -2,7 +2,7 @@
 namespace Nilemin\Virtualmin\Managers\Server;
 
 use Nilemin\Virtualmin\Http\HttpClientInterface;
-use Nilemin\Manager\BaseManager;
+use Nilemin\Virtualmin\Managers\BaseManager;
 use Nilemin\Virtualmin\Entities\Server;
 use Nilemin\Virtualmin\Entities\ServerRedirect;
 use Nilemin\Virtualmin\Entities\SubServer;
diff --git a/src/Virtualmin.php b/src/Virtualmin.php
index b68f553..aa0f15a 100644
--- a/src/Virtualmin.php
+++ b/src/Virtualmin.php
@@ -1,8 +1,7 @@
 <?php
 namespace Nilemin\Virtualmin;
 
-use Nilemin\Virtualmin\Accounts\Email\EmailAccountManager;
-use Nilemin\Virtualmin\Managers\Account\Email\EmailAccountBaseManager;
+use Nilemin\Virtualmin\Managers\Account\Email\EmailManager;
 use Nilemin\Virtualmin\Managers\Account\Ftp\FtpManager;
 use Nilemin\Virtualmin\Managers\Database\DatabaseManager;
 use Nilemin\Virtualmin\Managers\PHP\PHPManager;
@@ -121,7 +120,7 @@ class Virtualmin {
      *
      * @return ScriptsManager
      */
-    public function createCronManager(): ScriptsManager {
+    public function createCronManager(): CronManager {
         return $this->dc->create(CronManager::class);
     }