diff --git a/src/services/api/admin.js b/src/api/admin.js
similarity index 100%
rename from src/services/api/admin.js
rename to src/api/admin.js
diff --git a/src/services/api/chats.js b/src/api/chats.js
similarity index 95%
rename from src/services/api/chats.js
rename to src/api/chats.js
index 61be62c52..4a0c55752 100644
--- a/src/services/api/chats.js
+++ b/src/api/chats.js
@@ -1,4 +1,4 @@
-import { parseChat } from '../entity_normalizer/entity_normalizer.service.js'
+import { parseChat } from 'src/services/entity_normalizer/entity_normalizer.service.js'
 import { paramsString, promisedRequest } from './helpers.js'
 
 const PLEROMA_CHATS_URL = '/api/v1/pleroma/chats'
diff --git a/src/services/api/helpers.js b/src/api/helpers.js
similarity index 100%
rename from src/services/api/helpers.js
rename to src/api/helpers.js
diff --git a/src/services/api/public.js b/src/api/public.js
similarity index 99%
rename from src/services/api/public.js
rename to src/api/public.js
index 66847a32b..b0aa68140 100644
--- a/src/services/api/public.js
+++ b/src/api/public.js
@@ -8,7 +8,7 @@ import {
   parseSource,
   parseStatus,
   parseUser,
-} from '../entity_normalizer/entity_normalizer.service.js'
+} from 'src/services/entity_normalizer/entity_normalizer.service.js'
 import { paramsString, promisedRequest } from './helpers.js'
 
 import { RegistrationError, StatusCodeError } from 'src/services/errors/errors'
diff --git a/src/services/api/user.js b/src/api/user.js
similarity index 99%
rename from src/services/api/user.js
rename to src/api/user.js
index 28413e6c9..b2bffe057 100644
--- a/src/services/api/user.js
+++ b/src/api/user.js
@@ -6,7 +6,7 @@ import {
   parseSource,
   parseStatus,
   parseUser,
-} from '../entity_normalizer/entity_normalizer.service.js'
+} from 'src/services/entity_normalizer/entity_normalizer.service.js'
 import { paramsString, promisedRequest } from './helpers.js'
 import { fetchFriends, MASTODON_STATUS_URL } from './public.js'
 
diff --git a/src/components/bookmark_folder_edit/bookmark_folder_edit.js b/src/components/bookmark_folder_edit/bookmark_folder_edit.js
index 74bcf3109..748070495 100644
--- a/src/components/bookmark_folder_edit/bookmark_folder_edit.js
+++ b/src/components/bookmark_folder_edit/bookmark_folder_edit.js
@@ -4,7 +4,7 @@ import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { fetchBookmarkFolders } from 'src/services/api/user.js'
+import { fetchBookmarkFolders } from 'src/api/user.js'
 
 const BookmarkFolderEdit = {
   data() {
diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js
index 4249d3f3f..1b80b6321 100644
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@@ -5,7 +5,7 @@ import { mapGetters, mapState } from 'vuex'
 import ChatMessage from 'src/components/chat_message/chat_message.vue'
 import ChatTitle from 'src/components/chat_title/chat_title.vue'
 import PostStatusForm from 'src/components/post_status_form/post_status_form.vue'
-import { WSConnectionStatus } from '../../services/api/public.js'
+import { WSConnectionStatus } from 'src/api/public.js'
 import chatService from '../../services/chat_service/chat_service.js'
 import { buildFakeMessage } from '../../services/chat_utils/chat_utils.js'
 import { promiseInterval } from '../../services/promise_interval/promise_interval.js'
@@ -23,7 +23,7 @@ import {
   chatMessages,
   getOrCreateChat,
   sendChatMessage,
-} from 'src/services/api/chats.js'
+} from 'src/api/chats.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronDown, faChevronLeft } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/components/chat_new/chat_new.js b/src/components/chat_new/chat_new.js
index 3e0cc8db3..ec2656e5c 100644
--- a/src/components/chat_new/chat_new.js
+++ b/src/components/chat_new/chat_new.js
@@ -5,7 +5,7 @@ import UserAvatar from 'src/components/user_avatar/user_avatar.vue'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { chats } from 'src/services/api/chats.js'
+import { chats } from 'src/api/chats.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronLeft, faSearch } from '@fortawesome/free-solid-svg-icons'
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index d3d0ac949..30c437459 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -5,13 +5,13 @@ import { mapState } from 'vuex'
 import QuickFilterSettings from 'src/components/quick_filter_settings/quick_filter_settings.vue'
 import QuickViewSettings from 'src/components/quick_view_settings/quick_view_settings.vue'
 import ThreadTree from 'src/components/thread_tree/thread_tree.vue'
-import { WSConnectionStatus } from '../../services/api/public.js'
+import { WSConnectionStatus } from 'src/api/public.js'
 
+import { useOAuthStore } from 'src/stores/oauth.js'
 import { useInterfaceStore } from 'src/stores/interface'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { fetchConversation, fetchStatus } from 'src/services/api/public.js'
+import { fetchConversation, fetchStatus } from 'src/api/public.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
diff --git a/src/components/follow_request_card/follow_request_card.js b/src/components/follow_request_card/follow_request_card.js
index 1ee9b5c3b..c2e10c242 100644
--- a/src/components/follow_request_card/follow_request_card.js
+++ b/src/components/follow_request_card/follow_request_card.js
@@ -6,7 +6,7 @@ import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { approveUser, denyUser } from 'src/services/api/user.js'
+import { approveUser, denyUser } from 'src/api/user.js'
 
 const FollowRequestCard = {
   props: ['user'],
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 55311255e..b6ee27f9c 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -18,7 +18,7 @@ import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
 
-import { approveUser, denyUser } from 'src/services/api/user.js'
+import { approveUser, denyUser } from 'src/api/user.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
diff --git a/src/components/remote_user_resolver/remote_user_resolver.js b/src/components/remote_user_resolver/remote_user_resolver.js
index d68f6e608..b44629fcf 100644
--- a/src/components/remote_user_resolver/remote_user_resolver.js
+++ b/src/components/remote_user_resolver/remote_user_resolver.js
@@ -1,6 +1,6 @@
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { fetchUser } from 'src/services/api/public.js'
+import { fetchUser } from 'src/api/public.js'
 
 const RemoteUserResolver = {
   data: () => ({
diff --git a/src/components/settings_modal/helpers/emoji_editing_popover.vue b/src/components/settings_modal/helpers/emoji_editing_popover.vue
index 6cee8cebe..d3db657d3 100644
--- a/src/components/settings_modal/helpers/emoji_editing_popover.vue
+++ b/src/components/settings_modal/helpers/emoji_editing_popover.vue
@@ -159,7 +159,7 @@ import {
   addNewEmojiFile,
   deleteEmojiFile,
   updateEmojiFile,
-} from 'src/services/api/admin.js'
+} from 'src/api/admin.js'
 
 export default {
   components: {
diff --git a/src/components/settings_modal/tabs/appearance_tab.js b/src/components/settings_modal/tabs/appearance_tab.js
index 75f0d74aa..f159c6090 100644
--- a/src/components/settings_modal/tabs/appearance_tab.js
+++ b/src/components/settings_modal/tabs/appearance_tab.js
@@ -10,11 +10,11 @@ import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 import Preview from './old_theme_tab/theme_preview.vue'
 
+import { useOAuthStore } from 'src/stores/oauth.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { normalizeThemeData, useInterfaceStore } from 'src/stores/interface.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { updateProfileImages } from 'src/services/api/user.js'
+import { updateProfileImages } from 'src/api/user.js'
 import { newImporter } from 'src/services/export_import/export_import.js'
 import {
   adoptStyleSheets,
diff --git a/src/components/settings_modal/tabs/composing_tab.js b/src/components/settings_modal/tabs/composing_tab.js
index 31d0a5706..0ad4f4cf0 100644
--- a/src/components/settings_modal/tabs/composing_tab.js
+++ b/src/components/settings_modal/tabs/composing_tab.js
@@ -11,13 +11,13 @@ import IntegerSetting from '../helpers/integer_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 
+import { useOAuthStore } from 'src/stores/oauth.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
-import { updateProfile } from 'src/services/api/user.js'
+import { updateProfile } from 'src/api/user.js'
 import localeService from 'src/services/locale/locale.service.js'
 import { cacheKey, clearCache, emojiCacheKey } from 'src/services/sw/sw.js'
 
diff --git a/src/components/settings_modal/tabs/data_import_export_tab.js b/src/components/settings_modal/tabs/data_import_export_tab.js
index 0329ff125..a89657658 100644
--- a/src/components/settings_modal/tabs/data_import_export_tab.js
+++ b/src/components/settings_modal/tabs/data_import_export_tab.js
@@ -16,7 +16,7 @@ import {
   importFollows,
   importMutes,
   listBackups,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 
 const DataImportExportTab = {
   data() {
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index 48bbd67c7..e2302c774 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -8,14 +8,14 @@ import FloatSetting from '../helpers/float_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import UnitSetting from '../helpers/unit_setting.vue'
 
+import { useOAuthStore } from 'src/stores/oauth.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useLocalConfigStore } from 'src/stores/local_config.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
-import { updateProfile } from 'src/services/api/user.js'
+import { updateProfile } from 'src/api/user.js'
 import localeService from 'src/services/locale/locale.service.js'
 
 const GeneralTab = {
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
index da9a8cbb7..cb945012f 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
@@ -13,7 +13,7 @@ import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useOAuthTokensStore } from 'src/stores/oauth_tokens.js'
 
-import { importBlocks, importFollows } from 'src/services/api/user.js'
+import { importBlocks, importFollows } from 'src/api/user.js'
 
 const MutesAndBlocks = {
   data() {
diff --git a/src/components/settings_modal/tabs/notifications_tab.js b/src/components/settings_modal/tabs/notifications_tab.js
index 5fd1e8483..a666d42e3 100644
--- a/src/components/settings_modal/tabs/notifications_tab.js
+++ b/src/components/settings_modal/tabs/notifications_tab.js
@@ -3,7 +3,7 @@ import SharedComputedObject from '../helpers/shared_computed_object.js'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { updateNotificationSettings } from 'src/services/api/user.js'
+import { updateNotificationSettings } from 'src/api/user.js'
 
 const NotificationsTab = {
   data() {
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index b03c2012f..d30a82bf9 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -5,7 +5,7 @@ import SharedComputedObject from '../helpers/shared_computed_object.js'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { updateProfile } from 'src/services/api/user.js'
+import { updateProfile } from 'src/api/user.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
diff --git a/src/components/settings_modal/tabs/security_tab/mfa.js b/src/components/settings_modal/tabs/security_tab/mfa.js
index 32ce9ed21..12c464719 100644
--- a/src/components/settings_modal/tabs/security_tab/mfa.js
+++ b/src/components/settings_modal/tabs/security_tab/mfa.js
@@ -12,7 +12,7 @@ import {
   mfaConfirmOTP,
   mfaSetupOTP,
   settingsMFA,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 
 const Mfa = {
   data: () => ({
diff --git a/src/components/settings_modal/tabs/security_tab/mfa_totp.js b/src/components/settings_modal/tabs/security_tab/mfa_totp.js
index 393a36249..a22e88070 100644
--- a/src/components/settings_modal/tabs/security_tab/mfa_totp.js
+++ b/src/components/settings_modal/tabs/security_tab/mfa_totp.js
@@ -4,7 +4,7 @@ import Confirm from './confirm.vue'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { mfaDisableOTP } from 'src/services/api/user.js'
+import { mfaDisableOTP } from 'src/api/user.js'
 
 export default {
   props: ['settings'],
diff --git a/src/components/settings_modal/tabs/security_tab/security_tab.js b/src/components/settings_modal/tabs/security_tab/security_tab.js
index 35576e0d0..30a8b580e 100644
--- a/src/components/settings_modal/tabs/security_tab/security_tab.js
+++ b/src/components/settings_modal/tabs/security_tab/security_tab.js
@@ -15,7 +15,7 @@ import {
   deleteAlias,
   listAliases,
   moveAccount,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 import localeService from 'src/services/locale/locale.service.js'
 
 const SecurityTab = {
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 0ae234afe..2f10c5ebc 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -26,7 +26,7 @@ import { useOAuthStore } from 'src/stores/oauth.js'
 import { usePostStatusStore } from 'src/stores/post_status'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
 
-import { updateProfile } from 'src/services/api/user.js'
+import { updateProfile } from 'src/api/user.js'
 import { propsToNative } from 'src/services/attributes_helper/attributes_helper.service.js'
 import localeService from 'src/services/locale/locale.service.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index 68e30903e..9659022d4 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -8,7 +8,7 @@ import UserLink from 'src/components/user_link/user_link.vue'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useReportsStore } from 'src/stores/reports.js'
 
-import { reportUser } from 'src/services/api/user.js'
+import { reportUser } from 'src/api/user.js'
 
 const UserReportingModal = {
   components: {
diff --git a/src/components/who_to_follow/who_to_follow.js b/src/components/who_to_follow/who_to_follow.js
index 026f682ae..3c0b53b0d 100644
--- a/src/components/who_to_follow/who_to_follow.js
+++ b/src/components/who_to_follow/who_to_follow.js
@@ -3,7 +3,7 @@ import FollowCard from 'src/components/follow_card/follow_card.vue'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { fetchUser, suggestions } from 'src/services/api/public.js'
+import { fetchUser, suggestions } from 'src/api/public.js'
 
 const WhoToFollow = {
   components: {
diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.js b/src/components/who_to_follow_panel/who_to_follow_panel.js
index b8575396d..32f9dc918 100644
--- a/src/components/who_to_follow_panel/who_to_follow_panel.js
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.js
@@ -4,7 +4,7 @@ import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { fetchUser, suggestions } from 'src/services/api/public.js'
+import { fetchUser, suggestions } from 'src/api/public.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 function showWhoToFollow(panel, reply) {
diff --git a/src/modules/api.js b/src/modules/api.js
index 352509282..2dd5d23df 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -1,6 +1,6 @@
 import { Socket } from 'phoenix'
 
-import { WSConnectionStatus } from '../services/api/public.js'
+import { WSConnectionStatus } from 'src/api/public.js'
 import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js'
 
 import { useInstanceStore } from 'src/stores/instance.js'
@@ -13,7 +13,7 @@ import {
   fetchTimeline,
   getMastodonSocketURI,
   ProcessedWS,
-} from 'src/services/api/public.js'
+} from 'src/api/public.js'
 import followRequestFetcher from 'src/services/follow_request_fetcher/follow_request_fetcher.service'
 import notificationsFetcher from 'src/services/notifications_fetcher/notifications_fetcher.service.js'
 import timelineFetcher from 'src/services/timeline_fetcher/timeline_fetcher.service.js'
diff --git a/src/modules/chats.js b/src/modules/chats.js
index 8bd353a70..abc035f09 100644
--- a/src/modules/chats.js
+++ b/src/modules/chats.js
@@ -11,7 +11,7 @@ import { promiseInterval } from '../services/promise_interval/promise_interval.j
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { chats, deleteChatMessage, readChat } from 'src/services/api/chats.js'
+import { chats, deleteChatMessage, readChat } from 'src/api/chats.js'
 
 const emptyChatList = () => ({
   data: [],
diff --git a/src/modules/notifications.js b/src/modules/notifications.js
index d759be83b..d89cc79ba 100644
--- a/src/modules/notifications.js
+++ b/src/modules/notifications.js
@@ -1,4 +1,4 @@
-import { markNotificationsAsSeen } from '../services/api/user.js'
+import { markNotificationsAsSeen } from 'src/api/user.js'
 import {
   closeAllDesktopNotifications,
   closeDesktopNotification,
@@ -15,7 +15,7 @@ import { useOAuthStore } from 'src/stores/oauth.js'
 import { useReportsStore } from 'src/stores/reports.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
-import { dismissNotification } from 'src/services/api/user.js'
+import { dismissNotification } from 'src/api/user.js'
 
 const emptyNotifications = () => ({
   desktopNotificationSilence: true,
diff --git a/src/modules/profileConfig.js b/src/modules/profileConfig.js
index a7f3e73d8..28536a2f4 100644
--- a/src/modules/profileConfig.js
+++ b/src/modules/profileConfig.js
@@ -5,7 +5,7 @@ import { useOAuthStore } from 'src/stores/oauth.js'
 import {
   updateNotificationSettings,
   updateProfile,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 
 const defaultApi = ({ rootState, commit }, { path, value }) => {
   const params = {}
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index f62ee6b86..a8cecbecc 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -27,7 +27,7 @@ import {
   fetchStatusHistory,
   fetchStatusSource,
   search2,
-} from 'src/services/api/public.js'
+} from 'src/api/public.js'
 import {
   bookmarkStatus,
   deleteStatus,
@@ -42,7 +42,7 @@ import {
   unpinOwnStatus,
   unreactWithEmoji,
   unretweet,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 
 const emptyTl = (userId = 0) => ({
   statuses: [],
diff --git a/src/modules/users.js b/src/modules/users.js
index 1cd5139eb..0dc1f6aeb 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -9,7 +9,7 @@ import {
   uniq,
 } from 'lodash'
 
-import { register } from '../services/api/public.js'
+import { register } from 'src/api/public.js'
 import oauthApi from '../services/new_api/oauth.js'
 import {
   registerPushNotifications,
@@ -39,7 +39,7 @@ import {
   getCaptcha,
   searchUsers,
   verifyCredentials,
-} from 'src/services/api/public.js'
+} from 'src/api/public.js'
 import {
   fetchBlocks,
   fetchDomainMutes,
@@ -48,7 +48,7 @@ import {
   fetchUserRelationship,
   followUser,
   muteUser,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 
 // TODO: Unify with mergeOrAdd in statuses.js
 export const mergeOrAdd = (arr, obj, item) => {
diff --git a/src/services/follow_manipulate/follow_manipulate.js b/src/services/follow_manipulate/follow_manipulate.js
index d4af7f8c2..31b1686e9 100644
--- a/src/services/follow_manipulate/follow_manipulate.js
+++ b/src/services/follow_manipulate/follow_manipulate.js
@@ -4,7 +4,7 @@ import {
   fetchUserRelationship,
   followUser,
   unfollowUser,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 
 const fetchRelationship = (attempt, userId, store) =>
   new Promise((resolve, reject) => {
diff --git a/src/services/follow_request_fetcher/follow_request_fetcher.service.js b/src/services/follow_request_fetcher/follow_request_fetcher.service.js
index a6521601c..ecb6cb7dd 100644
--- a/src/services/follow_request_fetcher/follow_request_fetcher.service.js
+++ b/src/services/follow_request_fetcher/follow_request_fetcher.service.js
@@ -1,4 +1,4 @@
-import { fetchFollowRequests } from 'src/services/api/user.js'
+import { fetchFollowRequests } from 'src/api/user.js'
 import { promiseInterval } from 'src/services/promise_interval/promise_interval.js'
 
 const fetchAndUpdate = ({ store, credentials }) => {
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index a27bf6047..6258b0ebe 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -1,4 +1,4 @@
-import { fetchTimeline } from '../api/public.js'
+import { fetchTimeline } from 'src/api/public.js'
 import { promiseInterval } from '../promise_interval/promise_interval.js'
 
 import { useInstanceStore } from 'src/stores/instance.js'
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index 8b50e0f35..ddc4a2f9a 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -5,7 +5,7 @@ import {
   postStatus as apiPostStatus,
   setMediaDescription as apiSetMediaDescription,
   uploadMedia as apiUploadMedia,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 
 const postStatus = ({
   store,
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 496b1a4ea..b2ed40e47 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -1,6 +1,6 @@
 import { camelCase } from 'lodash'
 
-import { fetchTimeline } from '../api/public.js'
+import { fetchTimeline } from 'src/api/public.js'
 import { promiseInterval } from '../promise_interval/promise_interval.js'
 
 import { useInstanceStore } from 'src/stores/instance.js'
diff --git a/src/stores/admin_settings.js b/src/stores/admin_settings.js
index 88f655481..a437d56ca 100644
--- a/src/stores/admin_settings.js
+++ b/src/stores/admin_settings.js
@@ -31,8 +31,8 @@ import {
   setUsersRight,
   setUsersSuggestionStatus,
   setUsersTags,
-} from 'src/services/api/admin.js'
-import { listEmojiPacks } from 'src/services/api/public.js'
+} from 'src/api/admin.js'
+import { listEmojiPacks } from 'src/api/public.js'
 import { parseStatus } from 'src/services/entity_normalizer/entity_normalizer.service.js'
 
 export const defaultState = {
@@ -551,7 +551,7 @@ export const useAdminSettingsStore = defineStore('adminSettings', {
     listEmojiPacks(params) {
       return listEmojiPacks({
         ...params,
-        credentials: useOAuthStore().token,
+        credentials: useOAuthStore().token
       })
     },
     listRemoteEmojiPacks(params) {
diff --git a/src/stores/announcements.js b/src/stores/announcements.js
index 9a2560db5..2b738b905 100644
--- a/src/stores/announcements.js
+++ b/src/stores/announcements.js
@@ -7,9 +7,9 @@ import {
   deleteAnnouncement,
   editAnnouncement,
   postAnnouncement,
-} from 'src/services/api/admin.js'
-import { getAnnouncements } from 'src/services/api/public.js'
-import { dismissAnnouncement } from 'src/services/api/user.js'
+} from 'src/api/admin.js'
+import { getAnnouncements } from 'src/api/public.js'
+import { dismissAnnouncement } from 'src/api/user.js'
 
 const FETCH_ANNOUNCEMENT_INTERVAL_MS = 1000 * 60 * 5
 
diff --git a/src/stores/bookmark_folders.js b/src/stores/bookmark_folders.js
index c5c884f82..928ad13a6 100644
--- a/src/stores/bookmark_folders.js
+++ b/src/stores/bookmark_folders.js
@@ -8,7 +8,7 @@ import {
   deleteBookmarkFolder,
   fetchBookmarkFolders,
   updateBookmarkFolder,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 import { promiseInterval } from 'src/services/promise_interval/promise_interval.js'
 
 export const useBookmarkFoldersStore = defineStore('bookmarkFolders', {
diff --git a/src/stores/emoji.js b/src/stores/emoji.js
index 5fae78ce2..aefa79342 100644
--- a/src/stores/emoji.js
+++ b/src/stores/emoji.js
@@ -1,11 +1,11 @@
 import { merge } from 'lodash'
 import { defineStore } from 'pinia'
 
-import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useInstanceStore } from 'src/stores/instance.js'
 
 import { ensureFinalFallback } from 'src/i18n/languages.js'
-import { listEmojiPacks } from 'src/services/api/public.js'
+import { listEmojiPacks } from 'src/api/public.js'
 
 import { annotationsLoader } from 'virtual:pleroma-fe/emoji-annotations'
 
@@ -188,8 +188,7 @@ export const useEmojiStore = defineStore('emoji', {
       this.adminPacksLocalLoading = true
       this.adminPacksLocal = await this.getAdminPacks(
         useInstanceStore().server,
-        (params) =>
-          listEmojiPacks({
+        (params) => listEmojiPacks({
             ...params,
             credentials: useOAuthStore().token,
           }),
@@ -222,13 +221,14 @@ export const useEmojiStore = defineStore('emoji', {
                 instance,
                 page: i,
                 pageSize,
-              }).then((pageData) => {
-                if (pageData.error !== undefined) {
-                  return Promise.reject(pageData.error)
-                }
+              })
+                .then((pageData) => {
+                  if (pageData.error !== undefined) {
+                    return Promise.reject(pageData.error)
+                  }
 
-                return pageData.packs
-              }),
+                  return pageData.packs
+                }),
             )
           }
 
diff --git a/src/stores/instance.js b/src/stores/instance.js
index 17a13765a..8abb8078a 100644
--- a/src/stores/instance.js
+++ b/src/stores/instance.js
@@ -11,7 +11,7 @@ import {
   LOCAL_DEFAULT_CONFIG_DEFINITIONS,
   validateSetting,
 } from '../modules/default_config_state.js'
-import { fetchKnownDomains } from '../services/api/public.js'
+import { fetchKnownDomains } from 'src/api/public.js'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
 
diff --git a/src/stores/lists.js b/src/stores/lists.js
index 6431e1d2f..20529f06b 100644
--- a/src/stores/lists.js
+++ b/src/stores/lists.js
@@ -12,7 +12,7 @@ import {
   getListAccounts,
   removeAccountsFromList,
   updateList,
-} from 'src/services/api/user.js'
+} from 'src/api/user.js'
 import { promiseInterval } from 'src/services/promise_interval/promise_interval.js'
 
 export const useListsStore = defineStore('lists', {
diff --git a/src/stores/oauth_tokens.js b/src/stores/oauth_tokens.js
index 55914386b..bb9bbccbf 100644
--- a/src/stores/oauth_tokens.js
+++ b/src/stores/oauth_tokens.js
@@ -2,7 +2,7 @@ import { defineStore } from 'pinia'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { fetchOAuthTokens, revokeOAuthToken } from 'src/services/api/user.js'
+import { fetchOAuthTokens, revokeOAuthToken } from 'src/api/user.js'
 
 export const useOAuthTokensStore = defineStore('oauthTokens', {
   state: () => ({
diff --git a/src/stores/polls.js b/src/stores/polls.js
index 74812a24e..f2eafacfb 100644
--- a/src/stores/polls.js
+++ b/src/stores/polls.js
@@ -3,8 +3,8 @@ import { defineStore } from 'pinia'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { fetchPoll } from 'src/services/api/public.js'
-import { vote } from 'src/services/api/user.js'
+import { fetchPoll } from 'src/api/public.js'
+import { vote } from 'src/api/user.js'
 
 export const usePollsStore = defineStore('polls', {
   state: () => ({
diff --git a/src/stores/reports.js b/src/stores/reports.js
index 2fea2e8e6..7d319d8e3 100644
--- a/src/stores/reports.js
+++ b/src/stores/reports.js
@@ -4,7 +4,7 @@ import { defineStore } from 'pinia'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 
-import { setReportState } from 'src/services/api/admin.js'
+import { setReportState } from 'src/api/admin.js'
 
 export const useReportsStore = defineStore('reports', {
   state: () => ({
diff --git a/src/stores/sync_config.js b/src/stores/sync_config.js
index bdcc6cdb9..5ff42adaf 100644
--- a/src/stores/sync_config.js
+++ b/src/stores/sync_config.js
@@ -20,9 +20,9 @@ import { toRaw } from 'vue'
 
 import { CURRENT_UPDATE_COUNTER } from 'src/components/update_notification/update_notification.js'
 
+import { useOAuthStore } from 'src/stores/oauth.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useLocalConfigStore } from 'src/stores/local_config.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
 
 import { storage } from 'src/lib/storage.js'
 import {
@@ -32,7 +32,7 @@ import {
   validateSetting,
 } from 'src/modules/default_config_state.js'
 import { oldDefaultConfigSync } from 'src/modules/old_default_config_state.js'
-import { updateProfileJSON } from 'src/services/api/user.js'
+import { updateProfileJSON } from 'src/api/user.js'
 
 export const VERSION = 2
 export const NEW_USER_DATE = new Date('2026-03-16') // date of writing this, basically
diff --git a/src/stores/user_highlight.js b/src/stores/user_highlight.js
index 08b739d09..41570521f 100644
--- a/src/stores/user_highlight.js
+++ b/src/stores/user_highlight.js
@@ -17,7 +17,7 @@ import { toRaw } from 'vue'
 import { useOAuthStore } from 'src/stores/oauth.js'
 
 import { storage } from 'src/lib/storage.js'
-import { updateProfileJSON } from 'src/services/api/user.js'
+import { updateProfileJSON } from 'src/api/user.js'
 
 export const NEW_USER_DATE = new Date('2022-08-04') // date of writing this, basically
 
diff --git a/test/unit/specs/services/api/helpers.spec.js b/test/unit/specs/services/api/helpers.spec.js
index 3ffb83c70..b1219bd46 100644
--- a/test/unit/specs/services/api/helpers.spec.js
+++ b/test/unit/specs/services/api/helpers.spec.js
@@ -1,4 +1,4 @@
-import { paramsString } from 'src/services/api/helpers.js'
+import { paramsString } from 'src/api/helpers.js'
 
 describe('API Helpers', () => {
   describe.only('paramsString', () => {