diff --git a/lib/SP/Infrastructure/Account/Repositories/AccountSearchRepositoryInterface.php b/lib/SP/Domain/Account/Repositories/AccountSearchRepositoryInterface.php
similarity index 98%
rename from lib/SP/Infrastructure/Account/Repositories/AccountSearchRepositoryInterface.php
rename to lib/SP/Domain/Account/Repositories/AccountSearchRepositoryInterface.php
index 829827fa..e2c21f2b 100644
--- a/lib/SP/Infrastructure/Account/Repositories/AccountSearchRepositoryInterface.php
+++ b/lib/SP/Domain/Account/Repositories/AccountSearchRepositoryInterface.php
@@ -22,8 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Infrastructure\Account\Repositories;
-
+namespace SP\Domain\Account\Repositories;
 
 use Aura\SqlQuery\Common\SelectInterface;
 use SP\Domain\Account\Search\AccountSearchFilter;
diff --git a/lib/SP/Domain/Account/Services/AccountSearchService.php b/lib/SP/Domain/Account/Services/AccountSearchService.php
index 1eb9239c..3f7f0102 100644
--- a/lib/SP/Domain/Account/Services/AccountSearchService.php
+++ b/lib/SP/Domain/Account/Services/AccountSearchService.php
@@ -39,6 +39,7 @@ use SP\Domain\Account\AccountToFavoriteServiceInterface;
 use SP\Domain\Account\In\AccountToTagRepositoryInterface;
 use SP\Domain\Account\In\AccountToUserGroupRepositoryInterface;
 use SP\Domain\Account\In\AccountToUserRepositoryInterface;
+use SP\Domain\Account\Repositories\AccountSearchRepositoryInterface;
 use SP\Domain\Account\Search\AccountSearchConstants;
 use SP\Domain\Account\Search\AccountSearchFilter;
 use SP\Domain\Account\Search\AccountSearchTokenizer;
@@ -46,7 +47,6 @@ use SP\Domain\Common\Services\Service;
 use SP\Domain\Config\In\ConfigDataInterface;
 use SP\Domain\User\UserGroupServiceInterface;
 use SP\Domain\User\UserServiceInterface;
-use SP\Infrastructure\Account\Repositories\AccountSearchRepositoryInterface;
 use SP\Infrastructure\Database\QueryResult;
 use SP\Infrastructure\File\FileCache;
 use SP\Infrastructure\File\FileCacheInterface;
diff --git a/lib/SP/Infrastructure/Account/Repositories/AccountSearchRepository.php b/lib/SP/Infrastructure/Account/Repositories/AccountSearchRepository.php
index c731a03c..31e933dd 100644
--- a/lib/SP/Infrastructure/Account/Repositories/AccountSearchRepository.php
+++ b/lib/SP/Infrastructure/Account/Repositories/AccountSearchRepository.php
@@ -30,6 +30,7 @@ use Aura\SqlQuery\QueryFactory;
 use SP\Core\Context\ContextInterface;
 use SP\Core\Events\EventDispatcherInterface;
 use SP\DataModel\AccountSearchVData;
+use SP\Domain\Account\Repositories\AccountSearchRepositoryInterface;
 use SP\Domain\Account\Search\AccountSearchConstants;
 use SP\Domain\Account\Search\AccountSearchFilter;
 use SP\Domain\Account\Services\AccountFilterUserInterface;