diff --git a/src/DI.php b/src/DI.php
index 6eb1ed4b6..2c4163722 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -141,7 +141,7 @@ abstract class DI
 	}
 
 	/**
-	 * @return \Friendica\Core\PConfig\IPConfig
+	 * @return Core\PConfig\IPConfig
 	 */
 	public static function pConfig()
 	{
@@ -221,31 +221,31 @@ abstract class DI
 	//
 
 	/**
-	 * @return Factory\Mastodon\Account
+	 * @return Factory\Api\Mastodon\Account
 	 */
 	public static function mstdnAccount()
 	{
-		return self::$dice->create(Factory\Mastodon\Account::class);
+		return self::$dice->create(Factory\Api\Mastodon\Account::class);
 	}
 
 	/**
-	 * @return Factory\Mastodon\FollowRequest
+	 * @return Factory\Api\Mastodon\FollowRequest
 	 */
 	public static function mstdnFollowRequest()
 	{
-		return self::$dice->create(Factory\Mastodon\FollowRequest::class);
+		return self::$dice->create(Factory\Api\Mastodon\FollowRequest::class);
 	}
 
 	/**
-	 * @return Factory\Mastodon\Relationship
+	 * @return Factory\Api\Mastodon\Relationship
 	 */
 	public static function mstdnRelationship()
 	{
-		return self::$dice->create(Factory\Mastodon\Relationship::class);
+		return self::$dice->create(Factory\Api\Mastodon\Relationship::class);
 	}
 
 	/**
-	 * @return \Friendica\Factory\Notification\Notification
+	 * @return Factory\Notification\Notification
 	 */
 	public static function notification()
 	{
@@ -253,7 +253,7 @@ abstract class DI
 	}
 
 	/**
-	 * @return \Friendica\Factory\Notification\Introduction
+	 * @return Factory\Notification\Introduction
 	 */
 	public static function notificationIntro()
 	{
diff --git a/src/Factory/Mastodon/Account.php b/src/Factory/Api/Mastodon/Account.php
similarity index 96%
rename from src/Factory/Mastodon/Account.php
rename to src/Factory/Api/Mastodon/Account.php
index e777e76fe..60f9a76e1 100644
--- a/src/Factory/Mastodon/Account.php
+++ b/src/Factory/Api/Mastodon/Account.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Friendica\Factory\Mastodon;
+namespace Friendica\Factory\Api\Mastodon;
 
 use Friendica\App\BaseURL;
+use Friendica\BaseFactory;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Network\HTTPException;
-use Friendica\BaseFactory;
 use Psr\Log\LoggerInterface;
 
 class Account extends BaseFactory
diff --git a/src/Factory/Api/Mastodon/Emoji.php b/src/Factory/Api/Mastodon/Emoji.php
new file mode 100644
index 000000000..770966a77
--- /dev/null
+++ b/src/Factory/Api/Mastodon/Emoji.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Friendica\Factory\Api\Mastodon;
+
+use Friendica\App\BaseURL;
+use Friendica\BaseFactory;
+use Friendica\Model\APContact;
+use Friendica\Model\Contact;
+use Friendica\Network\HTTPException;
+use Psr\Log\LoggerInterface;
+
+class Emoji extends BaseFactory
+{
+	/** @var BaseURL */
+	protected $baseUrl;
+
+	public function __construct(LoggerInterface $logger, BaseURL $baseURL)
+	{
+		parent::__construct($logger);
+
+		$this->baseUrl = $baseURL;
+	}
+
+	/**
+	 * @param int $contactId
+	 * @param int $uid        User Id
+	 * @return \Friendica\Api\Entity\Mastodon\Account
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	public function createFromContactId(int $contactId, $uid = 0)
+	{
+		$cdata = Contact::getPublicAndUserContacID($contactId, $uid);
+		if (!empty($cdata)) {
+			$publicContact = Contact::getById($cdata['public']);
+			$userContact = Contact::getById($cdata['user']);
+		} else {
+			$publicContact = Contact::getById($contactId);
+			$userContact = [];
+		}
+
+		$apcontact = APContact::getByURL($publicContact['url'], false);
+
+		return new \Friendica\Api\Entity\Mastodon\Account($this->baseUrl, $publicContact, $apcontact, $userContact);
+	}
+}
diff --git a/src/Factory/Mastodon/FollowRequest.php b/src/Factory/Api/Mastodon/FollowRequest.php
similarity index 96%
rename from src/Factory/Mastodon/FollowRequest.php
rename to src/Factory/Api/Mastodon/FollowRequest.php
index 3aabe413d..e0125613a 100644
--- a/src/Factory/Mastodon/FollowRequest.php
+++ b/src/Factory/Api/Mastodon/FollowRequest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Friendica\Factory\Mastodon;
+namespace Friendica\Factory\Api\Mastodon;
 
 use Friendica\App\BaseURL;
+use Friendica\BaseFactory;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\Introduction;
 use Friendica\Network\HTTPException;
-use Friendica\BaseFactory;
 use Psr\Log\LoggerInterface;
 
 class FollowRequest extends BaseFactory
diff --git a/src/Factory/Mastodon/Relationship.php b/src/Factory/Api/Mastodon/Relationship.php
similarity index 95%
rename from src/Factory/Mastodon/Relationship.php
rename to src/Factory/Api/Mastodon/Relationship.php
index 7a8b216d4..121d57e2a 100644
--- a/src/Factory/Mastodon/Relationship.php
+++ b/src/Factory/Api/Mastodon/Relationship.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Factory\Mastodon;
+namespace Friendica\Factory\Api\Mastodon;
 
 use Friendica\Object\Api\Mastodon\Relationship as RelationshipEntity;
 use Friendica\BaseFactory;