21 files changed, 28 insertions, 28 deletions

diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts
index d3085267f..8eddaa496 100644
--- a/shared/models/users/user.model.ts
+++ b/shared/models/users/user.model.ts
@@ -1,5 +1,5 @@
 import { Account } from '../actors'
-import { VideoChannel } from '../videos/video-channel.model'
+import { VideoChannel } from '../videos/channel/video-channel.model'
 import { UserRole } from './user-role'
 import { NSFWPolicyType } from '../videos/nsfw-policy.type'
 
diff --git a/shared/models/videos/video-abuse-create.model.ts b/shared/models/videos/abuse/video-abuse-create.model.ts
index db6458275..db6458275 100644
--- a/shared/models/videos/video-abuse-create.model.ts
+++ b/shared/models/videos/abuse/video-abuse-create.model.ts
diff --git a/shared/models/videos/video-abuse-state.model.ts b/shared/models/videos/abuse/video-abuse-state.model.ts
index 529f034bd..529f034bd 100644
--- a/shared/models/videos/video-abuse-state.model.ts
+++ b/shared/models/videos/abuse/video-abuse-state.model.ts
diff --git a/shared/models/videos/video-abuse-update.model.ts b/shared/models/videos/abuse/video-abuse-update.model.ts
index 9b32aae48..9b32aae48 100644
--- a/shared/models/videos/video-abuse-update.model.ts
+++ b/shared/models/videos/abuse/video-abuse-update.model.ts
diff --git a/shared/models/videos/video-abuse.model.ts b/shared/models/videos/abuse/video-abuse.model.ts
index b2319aa00..4f668795a 100644
--- a/shared/models/videos/video-abuse.model.ts
+++ b/shared/models/videos/abuse/video-abuse.model.ts
@@ -1,5 +1,5 @@
-import { Account } from '../actors'
-import { VideoConstant } from './video-constant.model'
+import { Account } from '../../actors/index'
+import { VideoConstant } from '../video-constant.model'
 import { VideoAbuseState } from './video-abuse-state.model'
 
 export interface VideoAbuse {
diff --git a/shared/models/videos/video-blacklist-create.model.ts b/shared/models/videos/blacklist/video-blacklist-create.model.ts
index 89c69cb56..89c69cb56 100644
--- a/shared/models/videos/video-blacklist-create.model.ts
+++ b/shared/models/videos/blacklist/video-blacklist-create.model.ts
diff --git a/shared/models/videos/video-blacklist-update.model.ts b/shared/models/videos/blacklist/video-blacklist-update.model.ts
index 0a86cf7b0..0a86cf7b0 100644
--- a/shared/models/videos/video-blacklist-update.model.ts
+++ b/shared/models/videos/blacklist/video-blacklist-update.model.ts
diff --git a/shared/models/videos/video-blacklist.model.ts b/shared/models/videos/blacklist/video-blacklist.model.ts
index ef4e5e3a2..ef4e5e3a2 100644
--- a/shared/models/videos/video-blacklist.model.ts
+++ b/shared/models/videos/blacklist/video-blacklist.model.ts
diff --git a/shared/models/videos/video-caption-update.model.ts b/shared/models/videos/caption/video-caption-update.model.ts
index ff5728715..ff5728715 100644
--- a/shared/models/videos/video-caption-update.model.ts
+++ b/shared/models/videos/caption/video-caption-update.model.ts
diff --git a/shared/models/videos/video-caption.model.ts b/shared/models/videos/caption/video-caption.model.ts
index 4695224ce..d3c73e1a6 100644
--- a/shared/models/videos/video-caption.model.ts
+++ b/shared/models/videos/caption/video-caption.model.ts
@@ -1,4 +1,4 @@
-import { VideoConstant } from './video-constant.model'
+import { VideoConstant } from '../video-constant.model'
 
 export interface VideoCaption {
   language: VideoConstant<string>
diff --git a/shared/models/videos/video-channel-create.model.ts b/shared/models/videos/channel/video-channel-create.model.ts
index 08cd5fb84..08cd5fb84 100644
--- a/shared/models/videos/video-channel-create.model.ts
+++ b/shared/models/videos/channel/video-channel-create.model.ts
diff --git a/shared/models/videos/video-channel-update.model.ts b/shared/models/videos/channel/video-channel-update.model.ts
index 3626ce8a9..3626ce8a9 100644
--- a/shared/models/videos/video-channel-update.model.ts
+++ b/shared/models/videos/channel/video-channel-update.model.ts
diff --git a/shared/models/videos/video-channel.model.ts b/shared/models/videos/channel/video-channel.model.ts
index 6e61183a7..92918f66c 100644
--- a/shared/models/videos/video-channel.model.ts
+++ b/shared/models/videos/channel/video-channel.model.ts
@@ -1,6 +1,6 @@
-import { Actor } from '../actors/actor.model'
-import { Video } from './video.model'
-import { Account } from '../actors'
+import { Actor } from '../../actors/actor.model'
+import { Video } from '../video.model'
+import { Account } from '../../actors/index'
 
 export interface VideoChannel extends Actor {
   displayName: string
diff --git a/shared/models/videos/video-import-create.model.ts b/shared/models/videos/import/video-import-create.model.ts
index e76084e06..425477389 100644
--- a/shared/models/videos/video-import-create.model.ts
+++ b/shared/models/videos/import/video-import-create.model.ts
@@ -1,4 +1,4 @@
-import { VideoUpdate } from './video-update.model'
+import { VideoUpdate } from '../video-update.model'
 
 export interface VideoImportCreate extends VideoUpdate {
   targetUrl?: string
diff --git a/shared/models/videos/video-import-state.enum.ts b/shared/models/videos/import/video-import-state.enum.ts
index b178fbf3a..b178fbf3a 100644
--- a/shared/models/videos/video-import-state.enum.ts
+++ b/shared/models/videos/import/video-import-state.enum.ts
diff --git a/shared/models/videos/video-import.model.ts b/shared/models/videos/import/video-import.model.ts
index 293854006..e2a56617d 100644
--- a/shared/models/videos/video-import.model.ts
+++ b/shared/models/videos/import/video-import.model.ts
@@ -1,5 +1,5 @@
-import { Video } from './video.model'
-import { VideoConstant } from './video-constant.model'
+import { Video } from '../video.model'
+import { VideoConstant } from '../video-constant.model'
 import { VideoImportState } from './video-import-state.enum'
 
 export interface VideoImport {
diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts
index b99dd2d8f..6b579cf3e 100644
--- a/shared/models/videos/index.ts
+++ b/shared/models/videos/index.ts
@@ -1,16 +1,16 @@
-export * from './user-video-rate-update.model'
-export * from './user-video-rate.model'
-export * from './user-video-rate.type'
-export * from './video-abuse-state.model'
-export * from './video-abuse-create.model'
-export * from './video-abuse.model'
-export * from './video-abuse-update.model'
-export * from './video-blacklist.model'
-export * from './video-blacklist-create.model'
-export * from './video-blacklist-update.model'
-export * from './video-channel-create.model'
-export * from './video-channel-update.model'
-export * from './video-channel.model'
+export * from './rate/user-video-rate-update.model'
+export * from './rate/user-video-rate.model'
+export * from './rate/user-video-rate.type'
+export * from './abuse/video-abuse-state.model'
+export * from './abuse/video-abuse-create.model'
+export * from './abuse/video-abuse.model'
+export * from './abuse/video-abuse-update.model'
+export * from './blacklist/video-blacklist.model'
+export * from './blacklist/video-blacklist-create.model'
+export * from './blacklist/video-blacklist-update.model'
+export * from './channel/video-channel-create.model'
+export * from './channel/video-channel-update.model'
+export * from './channel/video-channel.model'
 export * from './video-create.model'
 export * from './video-privacy.enum'
 export * from './video-rate.type'
@@ -18,8 +18,8 @@ export * from './video-resolution.enum'
 export * from './video-update.model'
 export * from './video.model'
 export * from './video-state.enum'
-export * from './video-caption-update.model'
-export * from './video-import-create.model'
-export * from './video-import-state.enum'
-export * from './video-import.model'
+export * from './caption/video-caption-update.model'
+export * from './import/video-import-create.model'
+export * from './import/video-import-state.enum'
+export * from './import/video-import.model'
 export { VideoConstant } from './video-constant.model'
diff --git a/shared/models/videos/user-video-rate-update.model.ts b/shared/models/videos/rate/user-video-rate-update.model.ts
index 85e89271a..85e89271a 100644
--- a/shared/models/videos/user-video-rate-update.model.ts
+++ b/shared/models/videos/rate/user-video-rate-update.model.ts
diff --git a/shared/models/videos/user-video-rate.model.ts b/shared/models/videos/rate/user-video-rate.model.ts
index d39a1c3d5..d39a1c3d5 100644
--- a/shared/models/videos/user-video-rate.model.ts
+++ b/shared/models/videos/rate/user-video-rate.model.ts
diff --git a/shared/models/videos/user-video-rate.type.ts b/shared/models/videos/rate/user-video-rate.type.ts
index a4d9c7e39..a4d9c7e39 100644
--- a/shared/models/videos/user-video-rate.type.ts
+++ b/shared/models/videos/rate/user-video-rate.type.ts
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts
index 8dfa96069..8e1fbe444 100644
--- a/shared/models/videos/video.model.ts
+++ b/shared/models/videos/video.model.ts
@@ -1,7 +1,7 @@
 import { VideoResolution, VideoState } from '../../index'
 import { Account } from '../actors'
 import { Avatar } from '../avatars/avatar.model'
-import { VideoChannel } from './video-channel.model'
+import { VideoChannel } from './channel/video-channel.model'
 import { VideoPrivacy } from './video-privacy.enum'
 import { VideoScheduleUpdate } from './video-schedule-update.model'
 import { VideoConstant } from './video-constant.model'