5 files changed, 6 insertions, 11 deletions

diff --git a/shared/extra-utils/index.ts b/shared/extra-utils/index.ts
index 30f44dfc2..7d2887209 100644
--- a/shared/extra-utils/index.ts
+++ b/shared/extra-utils/index.ts
@@ -1,20 +1,11 @@
 export * from './bulk'
-
 export * from './cli'
-
 export * from './custom-pages'
-
 export * from './feeds'
-
 export * from './logs'
-
+export * from './miscs'
 export * from './mock-servers'
 
-export * from './miscs/email'
-export * from './miscs/sql'
-export * from './miscs/miscs'
-export * from './miscs/stubs'
-
 export * from './moderation/abuses'
 export * from './plugins/mock-blocklist'
 
diff --git a/shared/extra-utils/miscs/index.ts b/shared/extra-utils/miscs/index.ts
new file mode 100644
index 000000000..ccacd4c79
--- /dev/null
+++ b/shared/extra-utils/miscs/index.ts
@@ -0,0 +1,3 @@
+export * from './miscs'
+export * from './sql'
+export * from './stubs'
diff --git a/shared/extra-utils/mock-servers/index.ts b/shared/extra-utils/mock-servers/index.ts
index 47679c818..485757843 100644
--- a/shared/extra-utils/mock-servers/index.ts
+++ b/shared/extra-utils/mock-servers/index.ts
@@ -1,2 +1,3 @@
+export * from './mock-email'
 export * from './mock-instances-index'
 export * from './mock-joinpeertube-versions'
diff --git a/shared/extra-utils/miscs/email.ts b/shared/extra-utils/mock-servers/mock-email.ts
index 9fc9a5ad0..9fc9a5ad0 100644
--- a/shared/extra-utils/miscs/email.ts
+++ b/shared/extra-utils/mock-servers/mock-email.ts
diff --git a/shared/extra-utils/users/user-notifications.ts b/shared/extra-utils/users/user-notifications.ts
index 844f4442d..e75946eec 100644
--- a/shared/extra-utils/users/user-notifications.ts
+++ b/shared/extra-utils/users/user-notifications.ts
@@ -5,7 +5,7 @@ import { inspect } from 'util'
 import { AbuseState, PluginType } from '@shared/models'
 import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 import { UserNotification, UserNotificationSetting, UserNotificationSettingValue, UserNotificationType } from '../../models/users'
-import { MockSmtpServer } from '../miscs/email'
+import { MockSmtpServer } from '../mock-servers/mock-email'
 import { makeGetRequest, makePostBodyRequest, makePutBodyRequest } from '../requests/requests'
 import { doubleFollow } from '../server/follows'
 import { flushAndRunMultipleServers, ServerInfo } from '../server/servers'