18 files changed, 23 insertions, 27 deletions

diff --git a/server/tests/utils/cli.ts b/server/tests/utils/cli/cli.ts
index 4098fdf6f..54d05e9c6 100644
--- a/server/tests/utils/cli.ts
+++ b/server/tests/utils/cli/cli.ts
@@ -1,6 +1,6 @@
 import { exec } from 'child_process'
 
-import { ServerInfo } from './servers'
+import { ServerInfo } from '../server/servers'
 
 function getEnvCli (server?: ServerInfo) {
   return `NODE_ENV=test NODE_APP_INSTANCE=${server.serverNumber}`
diff --git a/server/tests/utils/index.ts b/server/tests/utils/index.ts
index b918ee83d..d7789e517 100644
--- a/server/tests/utils/index.ts
+++ b/server/tests/utils/index.ts
@@ -1,15 +1,15 @@
-export * from './activitypub'
-export * from './cli'
-export * from './clients'
-export * from './config'
-export * from './login'
-export * from './miscs'
-export * from './follows'
-export * from './requests'
-export * from './servers'
-export * from './services'
-export * from './users'
-export * from './video-abuses'
-export * from './video-blacklist'
-export * from './video-channels'
-export * from './videos'
+export * from './server/activitypub'
+export * from './cli/cli'
+export * from './server/clients'
+export * from './server/config'
+export * from './users/login'
+export * from './miscs/miscs'
+export * from './server/follows'
+export * from './requests/requests'
+export * from './server/servers'
+export * from './videos/services'
+export * from './users/users'
+export * from './videos/video-abuses'
+export * from './videos/video-blacklist'
+export * from './videos/video-channels'
+export * from './videos/videos'
diff --git a/server/tests/utils/miscs.ts b/server/tests/utils/miscs/miscs.ts
index 424b0db98..424b0db98 100644
--- a/server/tests/utils/miscs.ts
+++ b/server/tests/utils/miscs/miscs.ts
diff --git a/server/tests/utils/requests.ts b/server/tests/utils/requests/requests.ts
index 52b7a4c29..52b7a4c29 100644
--- a/server/tests/utils/requests.ts
+++ b/server/tests/utils/requests/requests.ts
diff --git a/server/tests/utils/activitypub.ts b/server/tests/utils/server/activitypub.ts
index cf3c1c3b3..cf3c1c3b3 100644
--- a/server/tests/utils/activitypub.ts
+++ b/server/tests/utils/server/activitypub.ts
diff --git a/server/tests/utils/clients.ts b/server/tests/utils/server/clients.ts
index a8c5b51c5..a8c5b51c5 100644
--- a/server/tests/utils/clients.ts
+++ b/server/tests/utils/server/clients.ts
diff --git a/server/tests/utils/config.ts b/server/tests/utils/server/config.ts
index d09c19c60..d09c19c60 100644
--- a/server/tests/utils/config.ts
+++ b/server/tests/utils/server/config.ts
diff --git a/server/tests/utils/follows.ts b/server/tests/utils/server/follows.ts
index a9f798bcb..82e89175c 100644
--- a/server/tests/utils/follows.ts
+++ b/server/tests/utils/server/follows.ts
@@ -1,5 +1,5 @@
 import * as request from 'supertest'
-import { wait } from './miscs'
+import { wait } from '../miscs/miscs'
 import { ServerInfo } from './servers'
 
 function getFollowersListPaginationAndSort (url: string, start: number, count: number, sort: string) {
diff --git a/server/tests/utils/jobs.ts b/server/tests/utils/server/jobs.ts
index 0a8c51575..0a8c51575 100644
--- a/server/tests/utils/jobs.ts
+++ b/server/tests/utils/server/jobs.ts
diff --git a/server/tests/utils/servers.ts b/server/tests/utils/server/servers.ts
index 8340fbc18..8340fbc18 100644
--- a/server/tests/utils/servers.ts
+++ b/server/tests/utils/server/servers.ts
diff --git a/server/tests/utils/login.ts b/server/tests/utils/users/login.ts
index 22d37c46f..855c4828d 100644
--- a/server/tests/utils/login.ts
+++ b/server/tests/utils/users/login.ts
@@ -1,6 +1,6 @@
 import * as request from 'supertest'
 
-import { ServerInfo } from './servers'
+import { ServerInfo } from '../server/servers'
 
 type Client = { id: string, secret: string }
 type User = { username: string, password: string }
diff --git a/server/tests/utils/users.ts b/server/tests/utils/users/users.ts
index a37d84ab4..bd8d7ab04 100644
--- a/server/tests/utils/users.ts
+++ b/server/tests/utils/users/users.ts
@@ -1,6 +1,6 @@
 import * as request from 'supertest'
 
-import { UserRole } from '../../../shared'
+import { UserRole } from '../../../../shared/index'
 
 function createUser (
   url: string,
diff --git a/server/tests/utils/services.ts b/server/tests/utils/videos/services.ts
index 1a53dd4cf..1a53dd4cf 100644
--- a/server/tests/utils/services.ts
+++ b/server/tests/utils/videos/services.ts
diff --git a/server/tests/utils/video-abuses.ts b/server/tests/utils/videos/video-abuses.ts
index f00809234..f00809234 100644
--- a/server/tests/utils/video-abuses.ts
+++ b/server/tests/utils/videos/video-abuses.ts
diff --git a/server/tests/utils/video-blacklist.ts b/server/tests/utils/videos/video-blacklist.ts
index 3a499f46a..3a499f46a 100644
--- a/server/tests/utils/video-blacklist.ts
+++ b/server/tests/utils/videos/video-blacklist.ts
diff --git a/server/tests/utils/video-channels.ts b/server/tests/utils/videos/video-channels.ts
index 0fb80d331..0fb80d331 100644
--- a/server/tests/utils/video-channels.ts
+++ b/server/tests/utils/videos/video-channels.ts
diff --git a/server/tests/utils/video-comments.ts b/server/tests/utils/videos/video-comments.ts
index 878147049..878147049 100644
--- a/server/tests/utils/video-comments.ts
+++ b/server/tests/utils/videos/video-comments.ts
diff --git a/server/tests/utils/videos.ts b/server/tests/utils/videos/videos.ts
index fb758cf29..6de1b8c92 100644
--- a/server/tests/utils/videos.ts
+++ b/server/tests/utils/videos/videos.ts
@@ -1,13 +1,9 @@
 import { readFile } from 'fs'
-import * as request from 'supertest'
-import { join, isAbsolute } from 'path'
 import * as parseTorrent from 'parse-torrent'
-
-import { makeGetRequest } from './requests'
-import { readFilePromise } from './miscs'
-import { ServerInfo } from './servers'
-import { getMyUserInformation } from './users'
-import { VideoPrivacy } from '../../../shared'
+import { isAbsolute, join } from 'path'
+import * as request from 'supertest'
+import { getMyUserInformation, makeGetRequest, readFilePromise, ServerInfo } from '../'
+import { VideoPrivacy } from '../../../../shared/models/videos'
 
 type VideoAttributes = {
   name?: string