150 files changed, 3466 insertions, 4864 deletions
diff --git a/package.json b/package.json
index eee282038..1f98b56e8 100644
--- a/package.json
+++ b/package.json
@@ -77,11 +77,13 @@
    "pem": "^1.12.3",
    "pg": "^6.4.2",
    "pg-hstore": "^2.3.2",
+    "reflect-metadata": "^0.1.10",
    "request": "^2.81.0",
    "rimraf": "^2.5.4",
    "safe-buffer": "^5.0.1",
    "scripty": "^1.5.0",
    "sequelize": "^4.7.5",
+    "sequelize-typescript": "^0.6.1",
    "ts-node": "^3.3.0",
    "typescript": "^2.5.2",
    "uuid": "^3.1.0",
diff --git a/scripts/danger/clean/cleaner.ts b/scripts/danger/clean/cleaner.ts
index 428333528..a22e2ed6a 100644
--- a/scripts/danger/clean/cleaner.ts
+++ b/scripts/danger/clean/cleaner.ts
@@ -1,12 +1,10 @@
-import * as rimraf from 'rimraf'
 import * as Promise from 'bluebird'
+import * as rimraf from 'rimraf'
+import { CONFIG, initDatabase, sequelizeTypescript } from '../../../server/initializers'
-import { CONFIG } from '../../../server/initializers/constants'
+initDatabase(true)
-import { database as db } from '../../../server/initializers/database'
-db.init(true)
  .then(() => {
-    return db.sequelize.drop()
+    return sequelizeTypescript.drop()
  })
  .then(() => {
    console.info('Tables of %s deleted.', CONFIG.DATABASE.DBNAME)
diff --git a/scripts/reset-password.ts b/scripts/reset-password.ts
index f0c06a7bf..a6863f807 100755
--- a/scripts/reset-password.ts
+++ b/scripts/reset-password.ts
@@ -1,6 +1,6 @@
 import * as program from 'commander'
+import { initDatabase } from '../server/initializers'
-import { database as db } from '../server/initializers/database'
+import { UserModel } from '../server/models/account/user'
 program
  .option('-u, --user [user]', 'User')
@@ -11,9 +11,9 @@ if (program['user'] === undefined) {
  process.exit(-1)
 }
-db.init(true)
+initDatabase(true)
  .then(() => {
-    return db.User.loadByUsername(program['user'])
+    return UserModel.loadByUsername(program['user'])
  })
  .then(user => {
    if (!user) {
diff --git a/scripts/update-host.ts b/scripts/update-host.ts
index 759443623..ba4656b75 100755
--- a/scripts/update-host.ts
+++ b/scripts/update-host.ts
@@ -1,12 +1,14 @@
-import { database as db } from '../server/initializers/database'
+import { getServerAccount } from '../server/helpers'
-import { getServerAccount } from '../server/helpers/utils'
+import { initDatabase } from '../server/initializers'
+import { AccountFollowModel } from '../server/models/account/account-follow'
+import { VideoModel } from '../server/models/video/video'
-db.init(true)
+initDatabase(true)
  .then(() => {
    return getServerAccount()
  })
  .then(serverAccount => {
-    return db.AccountFollow.listAcceptedFollowingUrlsForApi([ serverAccount.id ], undefined)
+    return AccountFollowModel.listAcceptedFollowingUrlsForApi([ serverAccount.id ], undefined)
  })
  .then(res => {
    return res.total > 0
@@ -18,7 +20,7 @@ db.init(true)
    }
    console.log('Updating torrent files.')
-    return db.Video.list()
+    return VideoModel.list()
  })
  .then(videos => {
    const tasks: Promise<any>[] = []
diff --git a/server.ts b/server.ts
index 39caf8996..2e9ed31d2 100644
--- a/server.ts
+++ b/server.ts
@@ -41,8 +41,8 @@ if (errorMessage !== null) {
 // Do not use barrels because we don't want to load all modules here (we need to initialize database first)
 import { logger } from './server/helpers/logger'
 // Initialize database and models
-import { database as db } from './server/initializers/database'
+import { initDatabase } from './server/initializers/database'
-db.init(false).then(() => onDatabaseInitDone())
+initDatabase(false).then(() => onDatabaseInitDone())
 // ----------- PeerTube modules -----------
 import { migrate, installApplication } from './server/initializers'
diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts
index a478acd14..72b216254 100644
--- a/server/controllers/activitypub/client.ts
+++ b/server/controllers/activitypub/client.ts
@@ -1,20 +1,22 @@
 // Intercept ActivityPub client requests
 import * as express from 'express'
-import { pageToStartAndCount } from '../../helpers'
+import { activityPubCollectionPagination, pageToStartAndCount } from '../../helpers'
-import { activityPubCollectionPagination } from '../../helpers/activitypub'
+import { ACTIVITY_PUB, CONFIG } from '../../initializers'
+import { buildVideoChannelAnnounceToFollowers } from '../../lib/activitypub/send'
-import { database as db } from '../../initializers'
-import { ACTIVITY_PUB, CONFIG } from '../../initializers/constants'
-import { buildVideoChannelAnnounceToFollowers } from '../../lib/activitypub/send/send-announce'
 import { buildVideoAnnounceToFollowers } from '../../lib/index'
-import { executeIfActivityPub, localAccountValidator } from '../../middlewares'
+import { asyncMiddleware, executeIfActivityPub, localAccountValidator } from '../../middlewares'
-import { asyncMiddleware } from '../../middlewares/async'
+import {
-import { videoChannelsGetValidator, videoChannelsShareValidator } from '../../middlewares/validators/video-channels'
+  videoChannelsGetValidator,
-import { videosGetValidator, videosShareValidator } from '../../middlewares/validators/videos'
+  videoChannelsShareValidator,
-import { AccountInstance, VideoChannelInstance } from '../../models'
+  videosGetValidator,
-import { VideoChannelShareInstance } from '../../models/video/video-channel-share-interface'
+  videosShareValidator
-import { VideoInstance } from '../../models/video/video-interface'
+} from '../../middlewares/validators'
-import { VideoShareInstance } from '../../models/video/video-share-interface'
+import { AccountModel } from '../../models/account/account'
+import { AccountFollowModel } from '../../models/account/account-follow'
+import { VideoModel } from '../../models/video/video'
+import { VideoChannelModel } from '../../models/video/video-channel'
+import { VideoChannelShareModel } from '../../models/video/video-channel-share'
+import { VideoShareModel } from '../../models/video/video-share'
 const activityPubClientRouter = express.Router()
@@ -62,57 +64,57 @@ export {
 // ---------------------------------------------------------------------------
 function accountController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const account: AccountInstance = res.locals.account
+  const account: AccountModel = res.locals.account
  return res.json(account.toActivityPubObject()).end()
 }
 async function accountFollowersController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const account: AccountInstance = res.locals.account
+  const account: AccountModel = res.locals.account
  const page = req.query.page || 1
  const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE)
-  const result = await db.AccountFollow.listAcceptedFollowerUrlsForApi([ account.id ], undefined, start, count)
+  const result = await AccountFollowModel.listAcceptedFollowerUrlsForApi([ account.id ], undefined, start, count)
  const activityPubResult = activityPubCollectionPagination(CONFIG.WEBSERVER.URL + req.url, page, result)
  return res.json(activityPubResult)
 }
 async function accountFollowingController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const account: AccountInstance = res.locals.account
+  const account: AccountModel = res.locals.account
  const page = req.query.page || 1
  const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE)
-  const result = await db.AccountFollow.listAcceptedFollowingUrlsForApi([ account.id ], undefined, start, count)
+  const result = await AccountFollowModel.listAcceptedFollowingUrlsForApi([ account.id ], undefined, start, count)
  const activityPubResult = activityPubCollectionPagination(CONFIG.WEBSERVER.URL + req.url, page, result)
  return res.json(activityPubResult)
 }
 function videoController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const video: VideoInstance = res.locals.video
+  const video: VideoModel = res.locals.video
  return res.json(video.toActivityPubObject())
 }
 async function videoAnnounceController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const share = res.locals.videoShare as VideoShareInstance
+  const share = res.locals.videoShare as VideoShareModel
  const object = await buildVideoAnnounceToFollowers(share.Account, res.locals.video, undefined)
  return res.json(object)
 }
 async function videoChannelAnnounceController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const share = res.locals.videoChannelShare as VideoChannelShareInstance
+  const share = res.locals.videoChannelShare as VideoChannelShareModel
  const object = await buildVideoChannelAnnounceToFollowers(share.Account, share.VideoChannel, undefined)
  return res.json(object)
 }
 async function videoChannelController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const videoChannel: VideoChannelInstance = res.locals.videoChannel
+  const videoChannel: VideoChannelModel = res.locals.videoChannel
  return res.json(videoChannel.toActivityPubObject())
 }
diff --git a/server/controllers/activitypub/outbox.ts b/server/controllers/activitypub/outbox.ts
index 5a2d43f3d..dc6b72a6e 100644
--- a/server/controllers/activitypub/outbox.ts
+++ b/server/controllers/activitypub/outbox.ts
@@ -2,13 +2,13 @@ import * as express from 'express'
 import { Activity } from '../../../shared/models/activitypub/activity'
 import { activityPubCollectionPagination } from '../../helpers/activitypub'
 import { pageToStartAndCount } from '../../helpers/core-utils'
-import { database as db } from '../../initializers'
 import { ACTIVITY_PUB } from '../../initializers/constants'
 import { addActivityData } from '../../lib/activitypub/send/send-add'
 import { getAnnounceActivityPubUrl } from '../../lib/activitypub/url'
 import { announceActivityData } from '../../lib/index'
 import { asyncMiddleware, localAccountValidator } from '../../middlewares'
-import { AccountInstance } from '../../models/account/account-interface'
+import { AccountModel } from '../../models/account/account'
+import { VideoModel } from '../../models/video/video'
 const outboxRouter = express.Router()
@@ -26,12 +26,12 @@ export {
 // ---------------------------------------------------------------------------
 async function outboxController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const account: AccountInstance = res.locals.account
+  const account: AccountModel = res.locals.account
  const page = req.query.page || 1
  const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE)
-  const data = await db.Video.listAllAndSharedByAccountForOutbox(account.id, start, count)
+  const data = await VideoModel.listAllAndSharedByAccountForOutbox(account.id, start, count)
  const activities: Activity[] = []
  for (const video of data.data) {
diff --git a/server/controllers/api/jobs.ts b/server/controllers/api/jobs.ts
index f6fbff369..4e7cd1ee3 100644
--- a/server/controllers/api/jobs.ts
+++ b/server/controllers/api/jobs.ts
@@ -1,11 +1,9 @@
 import * as express from 'express'
-import { asyncMiddleware, jobsSortValidator, setJobsSort, setPagination } from '../../middlewares'
+import { UserRight } from '../../../shared/models/users'
-import { paginationValidator } from '../../middlewares/validators/pagination'
+import { getFormattedObjects } from '../../helpers'
-import { database as db } from '../../initializers'
+import { asyncMiddleware, authenticate, ensureUserHasRight, jobsSortValidator, setJobsSort, setPagination } from '../../middlewares'
-import { getFormattedObjects } from '../../helpers/utils'
+import { paginationValidator } from '../../middlewares/validators'
-import { authenticate } from '../../middlewares/oauth'
+import { JobModel } from '../../models/job/job'
-import { ensureUserHasRight } from '../../middlewares/user-right'
-import { UserRight } from '../../../shared/models/users/user-right.enum'
 const jobsRouter = express.Router()
@@ -28,7 +26,7 @@ export {
 // ---------------------------------------------------------------------------
 async function listJobs (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const resultList = await db.Job.listForApi(req.query.start, req.query.count, req.query.sort)
+  const resultList = await JobModel.listForApi(req.query.start, req.query.count, req.query.sort)
  return res.json(getFormattedObjects(resultList.data, resultList.total))
 }
diff --git a/server/controllers/api/oauth-clients.ts b/server/controllers/api/oauth-clients.ts
index ac1ee9e36..bc02fce90 100644
--- a/server/controllers/api/oauth-clients.ts
+++ b/server/controllers/api/oauth-clients.ts
@@ -3,8 +3,8 @@ import * as express from 'express'
 import { CONFIG } from '../../initializers'
 import { logger } from '../../helpers'
 import { asyncMiddleware } from '../../middlewares'
-import { database as db } from '../../initializers/database'
 import { OAuthClientLocal } from '../../../shared'
+import { OAuthClientModel } from '../../models/oauth/oauth-client'
 const oauthClientsRouter = express.Router()
@@ -27,7 +27,7 @@ async function getLocalClient (req: express.Request, res: express.Response, next
    return res.type('json').status(403).end()
  }
-  const client = await db.OAuthClient.loadFirstClient()
+  const client = await OAuthClientModel.loadFirstClient()
  if (!client) throw new Error('No client available.')
  const json: OAuthClientLocal = {
diff --git a/server/controllers/api/server/follows.ts b/server/controllers/api/server/follows.ts
index c2fb37c39..913998e3a 100644
--- a/server/controllers/api/server/follows.ts
+++ b/server/controllers/api/server/follows.ts
@@ -1,24 +1,24 @@
 import * as express from 'express'
-import { UserRight } from '../../../../shared/models/users/user-right.enum'
+import { UserRight } from '../../../../shared/models/users'
-import { getFormattedObjects } from '../../../helpers'
+import { getAccountFromWebfinger, getFormattedObjects, getServerAccount, logger, retryTransactionWrapper } from '../../../helpers'
-import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { sequelizeTypescript, SERVER_ACCOUNT_NAME } from '../../../initializers'
-import { logger } from '../../../helpers/logger'
+import { saveAccountAndServerIfNotExist } from '../../../lib/activitypub'
-import { getServerAccount } from '../../../helpers/utils'
+import { sendUndoFollow } from '../../../lib/activitypub/send'
-import { getAccountFromWebfinger } from '../../../helpers/webfinger'
-import { SERVER_ACCOUNT_NAME } from '../../../initializers/constants'
-import { database as db } from '../../../initializers/database'
-import { saveAccountAndServerIfNotExist } from '../../../lib/activitypub/account'
-import { sendUndoFollow } from '../../../lib/activitypub/send/send-undo'
 import { sendFollow } from '../../../lib/index'
-import { asyncMiddleware, paginationValidator, removeFollowingValidator, setFollowersSort, setPagination } from '../../../middlewares'
+import {
-import { authenticate } from '../../../middlewares/oauth'
+  asyncMiddleware,
-import { setBodyHostsPort } from '../../../middlewares/servers'
+  authenticate,
-import { setFollowingSort } from '../../../middlewares/sort'
+  ensureUserHasRight,
-import { ensureUserHasRight } from '../../../middlewares/user-right'
+  paginationValidator,
-import { followValidator } from '../../../middlewares/validators/follows'
+  removeFollowingValidator,
-import { followersSortValidator, followingSortValidator } from '../../../middlewares/validators/sort'
+  setBodyHostsPort,
-import { AccountInstance } from '../../../models/account/account-interface'
+  setFollowersSort,
-import { AccountFollowInstance } from '../../../models/index'
+  setFollowingSort,
+  setPagination
+} from '../../../middlewares'
+import { followersSortValidator, followingSortValidator, followValidator } from '../../../middlewares/validators'
+import { AccountModel } from '../../../models/account/account'
+import { AccountFollowModel } from '../../../models/account/account-follow'
 const serverFollowsRouter = express.Router()
@@ -63,14 +63,14 @@ export {
 async function listFollowing (req: express.Request, res: express.Response, next: express.NextFunction) {
  const serverAccount = await getServerAccount()
-  const resultList = await db.AccountFollow.listFollowingForApi(serverAccount.id, req.query.start, req.query.count, req.query.sort)
+  const resultList = await AccountFollowModel.listFollowingForApi(serverAccount.id, req.query.start, req.query.count, req.query.sort)
  return res.json(getFormattedObjects(resultList.data, resultList.total))
 }
 async function listFollowers (req: express.Request, res: express.Response, next: express.NextFunction) {
  const serverAccount = await getServerAccount()
-  const resultList = await db.AccountFollow.listFollowersForApi(serverAccount.id, req.query.start, req.query.count, req.query.sort)
+  const resultList = await AccountFollowModel.listFollowersForApi(serverAccount.id, req.query.start, req.query.count, req.query.sort)
  return res.json(getFormattedObjects(resultList.data, resultList.total))
 }
@@ -110,14 +110,14 @@ async function followRetry (req: express.Request, res: express.Response, next: e
  return res.status(204).end()
 }
-async function follow (fromAccount: AccountInstance, targetAccount: AccountInstance, targetAlreadyInDB: boolean) {
+async function follow (fromAccount: AccountModel, targetAccount: AccountModel, targetAlreadyInDB: boolean) {
  try {
-    await db.sequelize.transaction(async t => {
+    await sequelizeTypescript.transaction(async t => {
      if (targetAlreadyInDB === false) {
        await saveAccountAndServerIfNotExist(targetAccount, t)
      }
-      const [ accountFollow ] = await db.AccountFollow.findOrCreate({
+      const [ accountFollow ] = await AccountFollowModel.findOrCreate({
        where: {
          accountId: fromAccount.id,
          targetAccountId: targetAccount.id
@@ -145,9 +145,9 @@ async function follow (fromAccount: AccountInstance, targetAccount: AccountInsta
 }
 async function removeFollow (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const follow: AccountFollowInstance = res.locals.follow
+  const follow: AccountFollowModel = res.locals.follow
-  await db.sequelize.transaction(async t => {
+  await sequelizeTypescript.transaction(async t => {
    if (follow.state === 'accepted') await sendUndoFollow(follow, t)
    await follow.destroy({ transaction: t })
@@ -164,7 +164,7 @@ async function removeFollow (req: express.Request, res: express.Response, next:
 async function loadLocalOrGetAccountFromWebfinger (name: string, host: string) {
  let loadedFromDB = true
-  let account = await db.Account.loadByNameAndHost(name, host)
+  let account = await AccountModel.loadByNameAndHost(name, host)
  if (!account) {
    const nameWithDomain = name + '@' + host
diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts
index f9b871724..d6c0e67f9 100644
--- a/server/controllers/api/users.ts
+++ b/server/controllers/api/users.ts
@@ -1,7 +1,7 @@
 import * as express from 'express'
 import { UserCreate, UserRight, UserRole, UserUpdate, UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../shared'
 import { getFormattedObjects, logger, retryTransactionWrapper } from '../../helpers'
-import { CONFIG, database as db } from '../../initializers'
+import { CONFIG } from '../../initializers'
 import { createUserAccountAndChannel } from '../../lib'
 import {
  asyncMiddleware,
@@ -11,6 +11,7 @@ import {
  paginationValidator,
  setPagination,
  setUsersSort,
+  setVideosSort,
  token,
  usersAddValidator,
  usersGetValidator,
@@ -21,9 +22,10 @@ import {
  usersUpdateValidator,
  usersVideoRatingValidator
 } from '../../middlewares'
-import { setVideosSort } from '../../middlewares/sort'
+import { videosSortValidator } from '../../middlewares/validators'
-import { videosSortValidator } from '../../middlewares/validators/sort'
+import { AccountVideoRateModel } from '../../models/account/account-video-rate'
-import { UserInstance } from '../../models'
+import { UserModel } from '../../models/account/user'
+import { VideoModel } from '../../models/video/video'
 const usersRouter = express.Router()
@@ -107,8 +109,8 @@ export {
 // ---------------------------------------------------------------------------
 async function getUserVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const user = res.locals.oauth.token.User
+  const user = res.locals.oauth.token.User as UserModel
-  const resultList = await db.Video.listUserVideosForApi(user.id ,req.query.start, req.query.count, req.query.sort)
+  const resultList = await VideoModel.listUserVideosForApi(user.id ,req.query.start, req.query.count, req.query.sort)
  return res.json(getFormattedObjects(resultList.data, resultList.total))
 }
@@ -127,7 +129,7 @@ async function createUserRetryWrapper (req: express.Request, res: express.Respon
 async function createUser (req: express.Request) {
  const body: UserCreate = req.body
-  const user = db.User.build({
+  const user = new UserModel({
    username: body.username,
    password: body.password,
    email: body.email,
@@ -155,7 +157,7 @@ async function registerUserRetryWrapper (req: express.Request, res: express.Resp
 async function registerUser (req: express.Request) {
  const body: UserCreate = req.body
-  const user = db.User.build({
+  const user = new UserModel({
    username: body.username,
    password: body.password,
    email: body.email,
@@ -171,7 +173,7 @@ async function registerUser (req: express.Request) {
 async function getUserInformation (req: express.Request, res: express.Response, next: express.NextFunction) {
  // We did not load channels in res.locals.user
-  const user = await db.User.loadByUsernameAndPopulateChannels(res.locals.oauth.token.user.username)
+  const user = await UserModel.loadByUsernameAndPopulateChannels(res.locals.oauth.token.user.username)
  return res.json(user.toFormattedJSON())
 }
@@ -184,7 +186,7 @@ async function getUserVideoRating (req: express.Request, res: express.Response,
  const videoId = +req.params.videoId
  const accountId = +res.locals.oauth.token.User.Account.id
-  const ratingObj = await db.AccountVideoRate.load(accountId, videoId, null)
+  const ratingObj = await AccountVideoRateModel.load(accountId, videoId, null)
  const rating = ratingObj ? ratingObj.type : 'none'
  const json: FormattedUserVideoRate = {
@@ -195,13 +197,13 @@ async function getUserVideoRating (req: express.Request, res: express.Response,
 }
 async function listUsers (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const resultList = await db.User.listForApi(req.query.start, req.query.count, req.query.sort)
+  const resultList = await UserModel.listForApi(req.query.start, req.query.count, req.query.sort)
  return res.json(getFormattedObjects(resultList.data, resultList.total))
 }
 async function removeUser (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const user = await db.User.loadById(req.params.id)
+  const user = await UserModel.loadById(req.params.id)
  await user.destroy()
@@ -225,7 +227,7 @@ async function updateMe (req: express.Request, res: express.Response, next: expr
 async function updateUser (req: express.Request, res: express.Response, next: express.NextFunction) {
  const body: UserUpdate = req.body
-  const user: UserInstance = res.locals.user
+  const user = res.locals.user as UserModel
  if (body.email !== undefined) user.email = body.email
  if (body.videoQuota !== undefined) user.videoQuota = body.videoQuota
diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts
index 29e1175c5..08cc4d0b4 100644
--- a/server/controllers/api/videos/abuse.ts
+++ b/server/controllers/api/videos/abuse.ts
@@ -1,11 +1,10 @@
 import * as express from 'express'
-import { database as db } from '../../../initializers/database'
 import {
  logger,
  getFormattedObjects,
  retryTransactionWrapper
 } from '../../../helpers'
+import { sequelizeTypescript } from '../../../initializers'
 import {
  authenticate,
  ensureUserHasRight,
@@ -16,9 +15,11 @@ import {
  setPagination,
  asyncMiddleware
 } from '../../../middlewares'
-import { VideoInstance } from '../../../models'
 import { VideoAbuseCreate, UserRight } from '../../../../shared'
 import { sendVideoAbuse } from '../../../lib/index'
+import { AccountModel } from '../../../models/account/account'
+import { VideoModel } from '../../../models/video/video'
+import { VideoAbuseModel } from '../../../models/video/video-abuse'
 const abuseVideoRouter = express.Router()
@@ -46,7 +47,7 @@ export {
 // ---------------------------------------------------------------------------
 async function listVideoAbuses (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const resultList = await db.VideoAbuse.listForApi(req.query.start, req.query.count, req.query.sort)
+  const resultList = await VideoAbuseModel.listForApi(req.query.start, req.query.count, req.query.sort)
  return res.json(getFormattedObjects(resultList.data, resultList.total))
 }
@@ -63,8 +64,8 @@ async function reportVideoAbuseRetryWrapper (req: express.Request, res: express.
 }
 async function reportVideoAbuse (req: express.Request, res: express.Response) {
-  const videoInstance = res.locals.video as VideoInstance
+  const videoInstance = res.locals.video as VideoModel
-  const reporterAccount = res.locals.oauth.token.User.Account
+  const reporterAccount = res.locals.oauth.token.User.Account as AccountModel
  const body: VideoAbuseCreate = req.body
  const abuseToCreate = {
@@ -73,8 +74,8 @@ async function reportVideoAbuse (req: express.Request, res: express.Response) {
    videoId: videoInstance.id
  }
-  await db.sequelize.transaction(async t => {
+  await sequelizeTypescript.transaction(async t => {
-    const videoAbuseInstance = await db.VideoAbuse.create(abuseToCreate, { transaction: t })
+    const videoAbuseInstance = await VideoAbuseModel.create(abuseToCreate, { transaction: t })
    videoAbuseInstance.Video = videoInstance
    // We send the video abuse to the origin server
diff --git a/server/controllers/api/videos/blacklist.ts b/server/controllers/api/videos/blacklist.ts
index 06333c271..d08c6e13f 100644
--- a/server/controllers/api/videos/blacklist.ts
+++ b/server/controllers/api/videos/blacklist.ts
@@ -1,6 +1,4 @@
 import * as express from 'express'
-import { database as db } from '../../../initializers'
 import { logger, getFormattedObjects } from '../../../helpers'
 import {
  authenticate,
@@ -13,8 +11,8 @@ import {
  setPagination,
  asyncMiddleware
 } from '../../../middlewares'
-import { BlacklistedVideoInstance } from '../../../models'
 import { BlacklistedVideo, UserRight } from '../../../../shared'
+import { VideoBlacklistModel } from '../../../models/video/video-blacklist'
 const blacklistRouter = express.Router()
@@ -57,18 +55,18 @@ async function addVideoToBlacklist (req: express.Request, res: express.Response,
    videoId: videoInstance.id
  }
-  await db.BlacklistedVideo.create(toCreate)
+  await VideoBlacklistModel.create(toCreate)
  return res.type('json').status(204).end()
 }
 async function listBlacklist (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const resultList = await db.BlacklistedVideo.listForApi(req.query.start, req.query.count, req.query.sort)
+  const resultList = await VideoBlacklistModel.listForApi(req.query.start, req.query.count, req.query.sort)
-  return res.json(getFormattedObjects<BlacklistedVideo, BlacklistedVideoInstance>(resultList.data, resultList.total))
+  return res.json(getFormattedObjects<BlacklistedVideo, VideoBlacklistModel>(resultList.data, resultList.total))
 }
 async function removeVideoFromBlacklistController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const blacklistedVideo = res.locals.blacklistedVideo as BlacklistedVideoInstance
+  const blacklistedVideo = res.locals.blacklistedVideo as VideoBlacklistModel
  try {
    await blacklistedVideo.destroy()
diff --git a/server/controllers/api/videos/channel.ts b/server/controllers/api/videos/channel.ts
index d99f47c32..683b0448d 100644
--- a/server/controllers/api/videos/channel.ts
+++ b/server/controllers/api/videos/channel.ts
@@ -1,7 +1,7 @@
 import * as express from 'express'
 import { VideoChannelCreate, VideoChannelUpdate } from '../../../../shared'
 import { getFormattedObjects, logger, resetSequelizeInstance, retryTransactionWrapper } from '../../../helpers'
-import { database as db } from '../../../initializers'
+import { sequelizeTypescript } from '../../../initializers'
 import { createVideoChannel } from '../../../lib'
 import { sendUpdateVideoChannel } from '../../../lib/activitypub/send/send-update'
 import {
@@ -17,7 +17,8 @@ import {
  videoChannelsSortValidator,
  videoChannelsUpdateValidator
 } from '../../../middlewares'
-import { AccountInstance, VideoChannelInstance } from '../../../models'
+import { AccountModel } from '../../../models/account/account'
+import { VideoChannelModel } from '../../../models/video/video-channel'
 const videoChannelRouter = express.Router()
@@ -66,13 +67,13 @@ export {
 // ---------------------------------------------------------------------------
 async function listVideoChannels (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const resultList = await db.VideoChannel.listForApi(req.query.start, req.query.count, req.query.sort)
+  const resultList = await VideoChannelModel.listForApi(req.query.start, req.query.count, req.query.sort)
  return res.json(getFormattedObjects(resultList.data, resultList.total))
 }
 async function listVideoAccountChannels (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const resultList = await db.VideoChannel.listByAccount(res.locals.account.id)
+  const resultList = await VideoChannelModel.listByAccount(res.locals.account.id)
  return res.json(getFormattedObjects(resultList.data, resultList.total))
 }
@@ -93,10 +94,10 @@ async function addVideoChannelRetryWrapper (req: express.Request, res: express.R
 async function addVideoChannel (req: express.Request, res: express.Response) {
  const videoChannelInfo: VideoChannelCreate = req.body
-  const account: AccountInstance = res.locals.oauth.token.User.Account
+  const account: AccountModel = res.locals.oauth.token.User.Account
-  let videoChannelCreated: VideoChannelInstance
+  let videoChannelCreated: VideoChannelModel
-  await db.sequelize.transaction(async t => {
+  await sequelizeTypescript.transaction(async t => {
    videoChannelCreated = await createVideoChannel(videoChannelInfo, account, t)
  })
@@ -115,12 +116,12 @@ async function updateVideoChannelRetryWrapper (req: express.Request, res: expres
 }
 async function updateVideoChannel (req: express.Request, res: express.Response) {
-  const videoChannelInstance: VideoChannelInstance = res.locals.videoChannel
+  const videoChannelInstance = res.locals.videoChannel as VideoChannelModel
  const videoChannelFieldsSave = videoChannelInstance.toJSON()
-  const videoChannelInfoToUpdate: VideoChannelUpdate = req.body
+  const videoChannelInfoToUpdate = req.body as VideoChannelUpdate
  try {
-    await db.sequelize.transaction(async t => {
+    await sequelizeTypescript.transaction(async t => {
      const sequelizeOptions = {
        transaction: t
      }
@@ -158,9 +159,9 @@ async function removeVideoChannelRetryWrapper (req: express.Request, res: expres
 }
 async function removeVideoChannel (req: express.Request, res: express.Response) {
-  const videoChannelInstance: VideoChannelInstance = res.locals.videoChannel
+  const videoChannelInstance: VideoChannelModel = res.locals.videoChannel
-  await db.sequelize.transaction(async t => {
+  await sequelizeTypescript.transaction(async t => {
    await videoChannelInstance.destroy({ transaction: t })
  })
@@ -168,7 +169,7 @@ async function removeVideoChannel (req: express.Request, res: express.Response)
 }
 async function getVideoChannel (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const videoChannelWithVideos = await db.VideoChannel.loadAndPopulateAccountAndVideos(res.locals.videoChannel.id)
+  const videoChannelWithVideos = await VideoChannelModel.loadAndPopulateAccountAndVideos(res.locals.videoChannel.id)
  return res.json(videoChannelWithVideos.toFormattedJSON())
 }
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts
index 63de662a7..91ab8c66a 100644
--- a/server/controllers/api/videos/index.ts
+++ b/server/controllers/api/videos/index.ts
@@ -12,16 +12,19 @@ import {
  retryTransactionWrapper
 } from '../../../helpers'
 import { getServerAccount } from '../../../helpers/utils'
-import { CONFIG, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_MIMETYPE_EXT, VIDEO_PRIVACIES } from '../../../initializers'
+import {
-import { database as db } from '../../../initializers/database'
+  CONFIG,
-import { sendAddVideo } from '../../../lib/activitypub/send/send-add'
+  sequelizeTypescript,
-import { sendCreateViewToOrigin } from '../../../lib/activitypub/send/send-create'
+  VIDEO_CATEGORIES,
-import { sendUpdateVideo } from '../../../lib/activitypub/send/send-update'
+  VIDEO_LANGUAGES,
-import { shareVideoByServer } from '../../../lib/activitypub/share'
+  VIDEO_LICENCES,
-import { getVideoActivityPubUrl } from '../../../lib/activitypub/url'
+  VIDEO_MIMETYPE_EXT,
-import { fetchRemoteVideoDescription } from '../../../lib/activitypub/videos'
+  VIDEO_PRIVACIES
+} from '../../../initializers'
+import { fetchRemoteVideoDescription, getVideoActivityPubUrl, shareVideoByServer } from '../../../lib/activitypub'
+import { sendAddVideo, sendCreateViewToOrigin, sendUpdateVideo } from '../../../lib/activitypub/send'
 import { sendCreateViewToVideoFollowers } from '../../../lib/index'
-import { transcodingJobScheduler } from '../../../lib/jobs/transcoding-job-scheduler/transcoding-job-scheduler'
+import { transcodingJobScheduler } from '../../../lib/jobs/transcoding-job-scheduler'
 import {
  asyncMiddleware,
  authenticate,
@@ -35,7 +38,9 @@ import {
  videosSortValidator,
  videosUpdateValidator
 } from '../../../middlewares'
-import { VideoInstance } from '../../../models'
+import { TagModel } from '../../../models/video/tag'
+import { VideoModel } from '../../../models/video/video'
+import { VideoFileModel } from '../../../models/video/video-file'
 import { abuseVideoRouter } from './abuse'
 import { blacklistRouter } from './blacklist'
 import { videoChannelRouter } from './channel'
@@ -99,7 +104,7 @@ videosRouter.put('/:id',
 videosRouter.post('/upload',
  authenticate,
  reqFiles,
-  videosAddValidator,
+  asyncMiddleware(videosAddValidator),
  asyncMiddleware(addVideoRetryWrapper)
 )
@@ -181,7 +186,7 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi
    duration: videoPhysicalFile['duration'], // duration was added by a previous middleware
    channelId: res.locals.videoChannel.id
  }
-  const video = db.Video.build(videoData)
+  const video = new VideoModel(videoData)
  video.url = getVideoActivityPubUrl(video)
  const videoFilePath = join(CONFIG.STORAGE.VIDEOS_DIR, videoPhysicalFile.filename)
@@ -192,7 +197,7 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi
    resolution: videoFileHeight,
    size: videoPhysicalFile.size
  }
-  const videoFile = db.VideoFile.build(videoFileData)
+  const videoFile = new VideoFileModel(videoFileData)
  const videoDir = CONFIG.STORAGE.VIDEOS_DIR
  const source = join(videoDir, videoPhysicalFile.filename)
  const destination = join(videoDir, video.getVideoFilename(videoFile))
@@ -210,7 +215,7 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi
  )
  await Promise.all(tasks)
-  return db.sequelize.transaction(async t => {
+  return sequelizeTypescript.transaction(async t => {
    const sequelizeOptions = { transaction: t }
    if (CONFIG.TRANSCODING.ENABLED === true) {
@@ -232,9 +237,9 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi
    video.VideoFiles = [ videoFile ]
    if (videoInfo.tags) {
-      const tagInstances = await db.Tag.findOrCreateTags(videoInfo.tags, t)
+      const tagInstances = await TagModel.findOrCreateTags(videoInfo.tags, t)
-      await video.setTags(tagInstances, sequelizeOptions)
+      await video.$set('Tags', tagInstances, sequelizeOptions)
      video.Tags = tagInstances
    }
@@ -264,13 +269,13 @@ async function updateVideoRetryWrapper (req: express.Request, res: express.Respo
 }
 async function updateVideo (req: express.Request, res: express.Response) {
-  const videoInstance: VideoInstance = res.locals.video
+  const videoInstance: VideoModel = res.locals.video
  const videoFieldsSave = videoInstance.toJSON()
  const videoInfoToUpdate: VideoUpdate = req.body
  const wasPrivateVideo = videoInstance.privacy === VideoPrivacy.PRIVATE
  try {
-    await db.sequelize.transaction(async t => {
+    await sequelizeTypescript.transaction(async t => {
      const sequelizeOptions = {
        transaction: t
      }
@@ -286,9 +291,9 @@ async function updateVideo (req: express.Request, res: express.Response) {
      const videoInstanceUpdated = await videoInstance.save(sequelizeOptions)
      if (videoInfoToUpdate.tags) {
-        const tagInstances = await db.Tag.findOrCreateTags(videoInfoToUpdate.tags, t)
+        const tagInstances = await TagModel.findOrCreateTags(videoInfoToUpdate.tags, t)
-        await videoInstance.setTags(tagInstances, sequelizeOptions)
+        await videoInstance.$set('Tags', tagInstances, sequelizeOptions)
        videoInstance.Tags = tagInstances
      }
@@ -350,7 +355,7 @@ async function getVideoDescription (req: express.Request, res: express.Response)
 }
 async function listVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const resultList = await db.Video.listForApi(req.query.start, req.query.count, req.query.sort)
+  const resultList = await VideoModel.listForApi(req.query.start, req.query.count, req.query.sort)
  return res.json(getFormattedObjects(resultList.data, resultList.total))
 }
@@ -367,9 +372,9 @@ async function removeVideoRetryWrapper (req: express.Request, res: express.Respo
 }
 async function removeVideo (req: express.Request, res: express.Response) {
-  const videoInstance: VideoInstance = res.locals.video
+  const videoInstance: VideoModel = res.locals.video
-  await db.sequelize.transaction(async t => {
+  await sequelizeTypescript.transaction(async t => {
    await videoInstance.destroy({ transaction: t })
  })
@@ -377,7 +382,7 @@ async function removeVideo (req: express.Request, res: express.Response) {
 }
 async function searchVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const resultList = await db.Video.searchAndPopulateAccountAndServerAndTags(
+  const resultList = await VideoModel.searchAndPopulateAccountAndServerAndTags(
    req.query.search,
    req.query.start,
    req.query.count,
diff --git a/server/controllers/api/videos/rate.ts b/server/controllers/api/videos/rate.ts
index c27c61116..48b744b0c 100644
--- a/server/controllers/api/videos/rate.ts
+++ b/server/controllers/api/videos/rate.ts
@@ -1,12 +1,12 @@
 import * as express from 'express'
 import { UserVideoRateUpdate } from '../../../../shared'
 import { logger, retryTransactionWrapper } from '../../../helpers'
-import { VIDEO_RATE_TYPES } from '../../../initializers'
+import { sequelizeTypescript, VIDEO_RATE_TYPES } from '../../../initializers'
-import { database as db } from '../../../initializers/database'
+import { sendVideoRateChangeToFollowers, sendVideoRateChangeToOrigin } from '../../../lib/activitypub'
-import { sendVideoRateChangeToFollowers, sendVideoRateChangeToOrigin } from '../../../lib/activitypub/videos'
 import { asyncMiddleware, authenticate, videoRateValidator } from '../../../middlewares'
-import { AccountInstance } from '../../../models/account/account-interface'
+import { AccountModel } from '../../../models/account/account'
-import { VideoInstance } from '../../../models/video/video-interface'
+import { AccountVideoRateModel } from '../../../models/account/account-video-rate'
+import { VideoModel } from '../../../models/video/video'
 const rateVideoRouter = express.Router()
@@ -38,12 +38,12 @@ async function rateVideoRetryWrapper (req: express.Request, res: express.Respons
 async function rateVideo (req: express.Request, res: express.Response) {
  const body: UserVideoRateUpdate = req.body
  const rateType = body.rating
-  const videoInstance: VideoInstance = res.locals.video
+  const videoInstance: VideoModel = res.locals.video
-  const accountInstance: AccountInstance = res.locals.oauth.token.User.Account
+  const accountInstance: AccountModel = res.locals.oauth.token.User.Account
-  await db.sequelize.transaction(async t => {
+  await sequelizeTypescript.transaction(async t => {
    const sequelizeOptions = { transaction: t }
-    const previousRate = await db.AccountVideoRate.load(accountInstance.id, videoInstance.id, t)
+    const previousRate = await AccountVideoRateModel.load(accountInstance.id, videoInstance.id, t)
    let likesToIncrement = 0
    let dislikesToIncrement = 0
@@ -71,7 +71,7 @@ async function rateVideo (req: express.Request, res: express.Response) {
        type: rateType
      }
-      await db.AccountVideoRate.create(query, sequelizeOptions)
+      await AccountVideoRateModel.create(query, sequelizeOptions)
    }
    const incrementQuery = {
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index 1b140b14a..9a72fe8e0 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -2,8 +2,6 @@ import * as express from 'express'
 import { join } from 'path'
 import * as validator from 'validator'
 import * as Bluebird from 'bluebird'
-import { database as db } from '../initializers/database'
 import {
  CONFIG,
  STATIC_PATHS,
@@ -13,7 +11,7 @@ import {
 } from '../initializers'
 import { root, readFileBufferPromise, escapeHTML } from '../helpers'
 import { asyncMiddleware } from '../middlewares'
-import { VideoInstance } from '../models'
+import { VideoModel } from '../models/video/video'
 const clientsRouter = express.Router()
@@ -49,7 +47,7 @@ export {
 // ---------------------------------------------------------------------------
-function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoInstance) {
+function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) {
  const previewUrl = CONFIG.WEBSERVER.URL + STATIC_PATHS.PREVIEWS + video.getPreviewName()
  const videoUrl = CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid
@@ -108,13 +106,13 @@ function addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoInstance
 async function generateWatchHtmlPage (req: express.Request, res: express.Response, next: express.NextFunction) {
  const videoId = '' + req.params.id
-  let videoPromise: Bluebird<VideoInstance>
+  let videoPromise: Bluebird<VideoModel>
  // Let Angular application handle errors
  if (validator.isUUID(videoId, 4)) {
-    videoPromise = db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(videoId)
+    videoPromise = VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(videoId)
  } else if (validator.isInt(videoId)) {
-    videoPromise = db.Video.loadAndPopulateAccountAndServerAndTags(+videoId)
+    videoPromise = VideoModel.loadAndPopulateAccountAndServerAndTags(+videoId)
  } else {
    return res.sendFile(indexPath)
  }
diff --git a/server/controllers/services.ts b/server/controllers/services.ts
index 0c325678c..3ac78a5df 100644
--- a/server/controllers/services.ts
+++ b/server/controllers/services.ts
@@ -1,9 +1,7 @@
 import * as express from 'express'
 import { CONFIG, EMBED_SIZE, PREVIEWS_SIZE } from '../initializers'
-import { oembedValidator } from '../middlewares'
+import { asyncMiddleware, oembedValidator } from '../middlewares'
-import { asyncMiddleware } from '../middlewares/async'
+import { VideoModel } from '../models/video/video'
-import { VideoInstance } from '../models'
 const servicesRouter = express.Router()
@@ -21,7 +19,7 @@ export {
 // ---------------------------------------------------------------------------
 function generateOEmbed (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const video = res.locals.video as VideoInstance
+  const video = res.locals.video as VideoModel
  const webserverUrl = CONFIG.WEBSERVER.URL
  const maxHeight = parseInt(req.query.maxheight, 10)
  const maxWidth = parseInt(req.query.maxwidth, 10)
diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index 7425fd097..33aed8927 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -1,6 +1,5 @@
 import * as express from 'express'
 import * as cors from 'cors'
 import {
  CONFIG,
  STATIC_MAX_AGE,
diff --git a/server/controllers/webfinger.ts b/server/controllers/webfinger.ts
index 78e5dee79..bb2ea40fa 100644
--- a/server/controllers/webfinger.ts
+++ b/server/controllers/webfinger.ts
@@ -1,7 +1,7 @@
 import * as express from 'express'
-import { asyncMiddleware } from '../middlewares/async'
+import { asyncMiddleware } from '../middlewares'
-import { webfingerValidator } from '../middlewares/validators/webfinger'
+import { webfingerValidator } from '../middlewares/validators'
-import { AccountInstance } from '../models/account/account-interface'
+import { AccountModel } from '../models/account/account'
 const webfingerRouter = express.Router()
@@ -19,7 +19,7 @@ export {
 // ---------------------------------------------------------------------------
 function webfingerController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const account: AccountInstance = res.locals.account
+  const account = res.locals.account as AccountModel
  const json = {
    subject: req.query.resource,
diff --git a/server/helpers/activitypub.ts b/server/helpers/activitypub.ts
index 1ea6422ca..43907b596 100644
--- a/server/helpers/activitypub.ts
+++ b/server/helpers/activitypub.ts
@@ -1,8 +1,8 @@
-import { Activity } from '../../shared/models/activitypub/activity'
+import { ResultList } from '../../shared/models'
-import { ResultList } from '../../shared/models/result-list.model'
+import { Activity } from '../../shared/models/activitypub'
-import { AccountInstance } from '../models/account/account-interface'
+import { ACTIVITY_PUB } from '../initializers'
+import { AccountModel } from '../models/account/account'
 import { signObject } from './peertube-crypto'
-import { ACTIVITY_PUB } from '../initializers/constants'
 function activityPubContextify <T> (data: T) {
  return Object.assign(data,{
@@ -71,7 +71,7 @@ function activityPubCollectionPagination (url: string, page: any, result: Result
  return orderedCollectionPagination
 }
-function buildSignedActivity (byAccount: AccountInstance, data: Object) {
+function buildSignedActivity (byAccount: AccountModel, data: Object) {
  const activity = activityPubContextify(data)
  return signObject(byAccount, activity) as Promise<Activity>
diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts
index e3c477414..8dc5d1f0d 100644
--- a/server/helpers/custom-validators/accounts.ts
+++ b/server/helpers/custom-validators/accounts.ts
@@ -2,8 +2,7 @@ import * as Bluebird from 'bluebird'
 import { Response } from 'express'
 import 'express-validator'
 import * as validator from 'validator'
-import { database as db } from '../../initializers'
+import { AccountModel } from '../../models/account/account'
-import { AccountInstance } from '../../models'
 import { isUserUsernameValid } from './users'
 function isAccountNameValid (value: string) {
@@ -11,24 +10,24 @@ function isAccountNameValid (value: string) {
 }
 function isAccountIdExist (id: number | string, res: Response) {
-  let promise: Bluebird<AccountInstance>
+  let promise: Bluebird<AccountModel>
  if (validator.isInt('' + id)) {
-    promise = db.Account.load(+id)
+    promise = AccountModel.load(+id)
  } else { // UUID
-    promise = db.Account.loadByUUID('' + id)
+    promise = AccountModel.loadByUUID('' + id)
  }
  return isAccountExist(promise, res)
 }
 function isLocalAccountNameExist (name: string, res: Response) {
-  const promise = db.Account.loadLocalByName(name)
+  const promise = AccountModel.loadLocalByName(name)
  return isAccountExist(promise, res)
 }
-async function isAccountExist (p: Bluebird<AccountInstance>, res: Response) {
+async function isAccountExist (p: Bluebird<AccountModel>, res: Response) {
  const account = await p
  if (!account) {
diff --git a/server/helpers/custom-validators/activitypub/account.ts b/server/helpers/custom-validators/activitypub/account.ts
index cab39a654..10bf81e8a 100644
--- a/server/helpers/custom-validators/activitypub/account.ts
+++ b/server/helpers/custom-validators/activitypub/account.ts
@@ -1,5 +1,5 @@
 import * as validator from 'validator'
-import { CONSTRAINTS_FIELDS } from '../../../initializers/constants'
+import { CONSTRAINTS_FIELDS } from '../../../initializers'
 import { isAccountNameValid } from '../accounts'
 import { exists, isUUIDValid } from '../misc'
 import { isActivityPubUrlValid, isBaseActivityValid } from './misc'
diff --git a/server/helpers/custom-validators/activitypub/activity.ts b/server/helpers/custom-validators/activitypub/activity.ts
index 3a0e8197c..043e3c55e 100644
--- a/server/helpers/custom-validators/activitypub/activity.ts
+++ b/server/helpers/custom-validators/activitypub/activity.ts
@@ -1,8 +1,9 @@
 import * as validator from 'validator'
-import { Activity, ActivityType } from '../../../../shared/models/activitypub/activity'
+import { Activity, ActivityType } from '../../../../shared/models/activitypub'
 import { isAccountAcceptActivityValid, isAccountDeleteActivityValid, isAccountFollowActivityValid } from './account'
 import { isAnnounceActivityValid } from './announce'
 import { isActivityPubUrlValid } from './misc'
+import { isDislikeActivityValid, isLikeActivityValid } from './rate'
 import { isUndoActivityValid } from './undo'
 import { isVideoChannelCreateActivityValid, isVideoChannelDeleteActivityValid, isVideoChannelUpdateActivityValid } from './video-channels'
 import {
@@ -12,7 +13,6 @@ import {
  isVideoTorrentUpdateActivityValid
 } from './videos'
 import { isViewActivityValid } from './view'
-import { isDislikeActivityValid, isLikeActivityValid } from './rate'
 function isRootActivityValid (activity: any) {
  return Array.isArray(activity['@context']) &&
diff --git a/server/helpers/custom-validators/activitypub/misc.ts b/server/helpers/custom-validators/activitypub/misc.ts
index 1bbfd0fc4..65f5ca809 100644
--- a/server/helpers/custom-validators/activitypub/misc.ts
+++ b/server/helpers/custom-validators/activitypub/misc.ts
@@ -1,7 +1,7 @@
 import * as validator from 'validator'
-import { exists } from '../misc'
+import { CONSTRAINTS_FIELDS } from '../../../initializers'
 import { isTestInstance } from '../../core-utils'
-import { CONSTRAINTS_FIELDS } from '../../../initializers/constants'
+import { exists } from '../misc'
 function isActivityPubUrlValid (url: string) {
  const isURLOptions = {
diff --git a/server/helpers/custom-validators/index.ts b/server/helpers/custom-validators/index.ts
deleted file mode 100644
index d3b2f5393..000000000
--- a/server/helpers/custom-validators/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export * from './activitypub'
-export * from './misc'
-export * from './servers'
-export * from './servers'
-export * from './users'
-export * from './accounts'
-export * from './video-channels'
-export * from './videos'
-export * from './webfinger'
diff --git a/server/helpers/custom-validators/video-channels.ts b/server/helpers/custom-validators/video-channels.ts
index 3de9f041b..6bc96bf51 100644
--- a/server/helpers/custom-validators/video-channels.ts
+++ b/server/helpers/custom-validators/video-channels.ts
@@ -2,8 +2,8 @@ import * as express from 'express'
 import 'express-validator'
 import 'multer'
 import * as validator from 'validator'
-import { CONSTRAINTS_FIELDS, database as db } from '../../initializers'
+import { CONSTRAINTS_FIELDS } from '../../initializers'
-import { VideoChannelInstance } from '../../models'
+import { VideoChannelModel } from '../../models/video/video-channel'
 import { exists } from './misc'
 const VIDEO_CHANNELS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_CHANNELS
@@ -17,11 +17,11 @@ function isVideoChannelNameValid (value: string) {
 }
 async function isVideoChannelExist (id: string, res: express.Response) {
-  let videoChannel: VideoChannelInstance
+  let videoChannel: VideoChannelModel
  if (validator.isInt(id)) {
-    videoChannel = await db.VideoChannel.loadAndPopulateAccount(+id)
+    videoChannel = await VideoChannelModel.loadAndPopulateAccount(+id)
  } else { // UUID
-    videoChannel = await db.VideoChannel.loadByUUIDAndPopulateAccount(id)
+    videoChannel = await VideoChannelModel.loadByUUIDAndPopulateAccount(id)
  }
  if (!videoChannel) {
diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts
index 37fa8b08a..ee9d0ed19 100644
--- a/server/helpers/custom-validators/videos.ts
+++ b/server/helpers/custom-validators/videos.ts
@@ -4,10 +4,15 @@ import { values } from 'lodash'
 import 'multer'
 import * as validator from 'validator'
 import { VideoRateType } from '../../../shared'
-import { CONSTRAINTS_FIELDS, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_RATE_TYPES } from '../../initializers'
+import {
-import { VIDEO_PRIVACIES } from '../../initializers/constants'
+  CONSTRAINTS_FIELDS,
-import { database as db } from '../../initializers/database'
+  VIDEO_CATEGORIES,
-import { VideoInstance } from '../../models/video/video-interface'
+  VIDEO_LANGUAGES,
+  VIDEO_LICENCES,
+  VIDEO_PRIVACIES,
+  VIDEO_RATE_TYPES
+} from '../../initializers'
+import { VideoModel } from '../../models/video/video'
 import { exists, isArray } from './misc'
 const VIDEOS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEOS
@@ -100,12 +105,12 @@ function isVideoFileSizeValid (value: string) {
 }
 async function isVideoExist (id: string, res: Response) {
-  let video: VideoInstance
+  let video: VideoModel
  if (validator.isInt(id)) {
-    video = await db.Video.loadAndPopulateAccountAndServerAndTags(+id)
+    video = await VideoModel.loadAndPopulateAccountAndServerAndTags(+id)
  } else { // UUID
-    video = await db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(id)
+    video = await VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(id)
  }
  if (!video) {
diff --git a/server/helpers/custom-validators/webfinger.ts b/server/helpers/custom-validators/webfinger.ts
index e93115d81..38f6b938d 100644
--- a/server/helpers/custom-validators/webfinger.ts
+++ b/server/helpers/custom-validators/webfinger.ts
@@ -1,6 +1,4 @@
-import 'express-validator'
+import { CONFIG } from '../../initializers'
-import 'multer'
-import { CONFIG } from '../../initializers/constants'
 import { exists } from './misc'
 function isWebfingerResourceValid (value: string) {
@@ -13,9 +11,7 @@ function isWebfingerResourceValid (value: string) {
  const host = accountParts[1]
-  if (host !== CONFIG.WEBSERVER.HOST) return false
+  return host === CONFIG.WEBSERVER.HOST
-  return true
 }
 // ---------------------------------------------------------------------------
diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts
index 8ad205961..c2581f460 100644
--- a/server/helpers/ffmpeg-utils.ts
+++ b/server/helpers/ffmpeg-utils.ts
@@ -1,5 +1,5 @@
 import * as ffmpeg from 'fluent-ffmpeg'
-import { VideoResolution } from '../../shared/models/videos/video-resolution.enum'
+import { VideoResolution } from '../../shared/models/videos'
 import { CONFIG } from '../initializers'
 function getVideoFileHeight (path: string) {
diff --git a/server/helpers/index.ts b/server/helpers/index.ts
index 2c7ac3954..d96bc48e9 100644
--- a/server/helpers/index.ts
+++ b/server/helpers/index.ts
@@ -1,7 +1,6 @@
 export * from './activitypub'
 export * from './core-utils'
 export * from './logger'
-export * from './custom-validators'
 export * from './ffmpeg-utils'
 export * from './database-utils'
 export * from './peertube-crypto'
diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index 8d809d16d..2676133db 100644
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -2,7 +2,7 @@
 import * as mkdirp from 'mkdirp'
 import * as path from 'path'
 import * as winston from 'winston'
-import { CONFIG } from '../initializers/constants'
+import { CONFIG } from '../initializers'
 const label = CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
diff --git a/server/helpers/peertube-crypto.ts b/server/helpers/peertube-crypto.ts
index 74e4cc703..c4c735cb8 100644
--- a/server/helpers/peertube-crypto.ts
+++ b/server/helpers/peertube-crypto.ts
@@ -1,5 +1,5 @@
 import { BCRYPT_SALT_SIZE, PRIVATE_RSA_KEY_SIZE } from '../initializers'
-import { AccountInstance } from '../models/account/account-interface'
+import { AccountModel } from '../models/account/account'
 import { bcryptComparePromise, bcryptGenSaltPromise, bcryptHashPromise, createPrivateKey, getPublicKey } from './core-utils'
 import { jsig } from './custom-jsonld-signature'
 import { logger } from './logger'
@@ -13,7 +13,7 @@ async function createPrivateAndPublicKeys () {
  return { privateKey: key, publicKey }
 }
-function isSignatureVerified (fromAccount: AccountInstance, signedDocument: object) {
+function isSignatureVerified (fromAccount: AccountModel, signedDocument: object) {
  const publicKeyObject = {
    '@context': jsig.SECURITY_CONTEXT_URL,
    '@id': fromAccount.url,
@@ -40,7 +40,7 @@ function isSignatureVerified (fromAccount: AccountInstance, signedDocument: obje
    })
 }
-function signObject (byAccount: AccountInstance, data: any) {
+function signObject (byAccount: AccountModel, data: any) {
  const options = {
    privateKeyPem: byAccount.privateKey,
    creator: byAccount.url
diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index 3464341e6..cb5e536b8 100644
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -1,9 +1,10 @@
 import * as express from 'express'
-import * as Sequelize from 'sequelize'
+import { Model } from 'sequelize-typescript'
 import { ResultList } from '../../shared'
-import { VideoResolution } from '../../shared/models/videos/video-resolution.enum'
+import { VideoResolution } from '../../shared/models/videos'
-import { CONFIG, database as db } from '../initializers'
+import { CONFIG } from '../initializers'
-import { AccountInstance } from '../models/account/account-interface'
+import { AccountModel } from '../models/account/account'
+import { UserModel } from '../models/account/user'
 import { pseudoRandomBytesPromise } from './core-utils'
 import { logger } from './logger'
@@ -46,7 +47,7 @@ async function isSignupAllowed () {
    return true
  }
-  const totalUsers = await db.User.countTotal()
+  const totalUsers = await UserModel.countTotal()
  return totalUsers < CONFIG.SIGNUP.LIMIT
 }
@@ -72,17 +73,17 @@ function computeResolutionsToTranscode (videoFileHeight: number) {
  return resolutionsEnabled
 }
-function resetSequelizeInstance (instance: Sequelize.Instance<any>, savedFields: object) {
+function resetSequelizeInstance (instance: Model<any>, savedFields: object) {
  Object.keys(savedFields).forEach(key => {
    const value = savedFields[key]
    instance.set(key, value)
  })
 }
-let serverAccount: AccountInstance
+let serverAccount: AccountModel
 async function getServerAccount () {
  if (serverAccount === undefined) {
-    serverAccount = await db.Account.loadApplication()
+    serverAccount = await AccountModel.loadApplication()
  }
  if (!serverAccount) {
diff --git a/server/helpers/webfinger.ts b/server/helpers/webfinger.ts
index ab2888981..d98068cd7 100644
--- a/server/helpers/webfinger.ts
+++ b/server/helpers/webfinger.ts
@@ -1,8 +1,8 @@
 import * as WebFinger from 'webfinger.js'
 import { WebFingerData } from '../../shared'
-import { fetchRemoteAccount } from '../lib/activitypub/account'
+import { fetchRemoteAccount } from '../lib/activitypub'
 import { isTestInstance } from './core-utils'
-import { isActivityPubUrlValid } from './custom-validators'
+import { isActivityPubUrlValid } from './custom-validators/activitypub'
 const webfinger = new WebFinger({
  webfist_fallback: false,
diff --git a/server/initializers/checker.ts b/server/initializers/checker.ts
index 317d59423..7e76990b5 100644
--- a/server/initializers/checker.ts
+++ b/server/initializers/checker.ts
@@ -1,8 +1,8 @@
 import * as config from 'config'
-import { promisify0 } from '../helpers/core-utils'
+import { promisify0 } from '../helpers'
-import { UserModel } from '../models/account/user-interface'
+import { UserModel } from '../models/account/user'
-import { ApplicationModel } from '../models/application/application-interface'
+import { ApplicationModel } from '../models/application/application'
-import { OAuthClientModel } from '../models/oauth/oauth-client-interface'
+import { OAuthClientModel } from '../models/oauth/oauth-client'
 // Some checks on configuration files
 function checkConfig () {
@@ -57,22 +57,22 @@ async function checkFFmpeg (CONFIG: { TRANSCODING: { ENABLED: boolean } }) {
 }
 // We get db by param to not import it in this file (import orders)
-async function clientsExist (OAuthClient: OAuthClientModel) {
+async function clientsExist () {
-  const totalClients = await OAuthClient.countTotal()
+  const totalClients = await OAuthClientModel.countTotal()
  return totalClients !== 0
 }
 // We get db by param to not import it in this file (import orders)
-async function usersExist (User: UserModel) {
+async function usersExist () {
-  const totalUsers = await User.countTotal()
+  const totalUsers = await UserModel.countTotal()
  return totalUsers !== 0
 }
 // We get db by param to not import it in this file (import orders)
-async function applicationExist (Application: ApplicationModel) {
+async function applicationExist () {
-  const totalApplication = await Application.countTotal()
+  const totalApplication = await ApplicationModel.countTotal()
  return totalApplication !== 0
 }
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 7be7a5f95..f539eb2ee 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -1,16 +1,10 @@
 import * as config from 'config'
 import { join } from 'path'
+import { JobCategory, JobState, VideoRateType } from '../../shared/models'
+import { FollowState } from '../../shared/models/accounts'
+import { VideoPrivacy } from '../../shared/models/videos'
 // Do not use barrels, remain constants as independent as possible
-import { root, isTestInstance } from '../helpers/core-utils'
+import { isTestInstance, root } from '../helpers/core-utils'
-import {
-  VideoRateType,
-  JobState,
-  JobCategory
-} from '../../shared/models'
-import { VideoPrivacy } from '../../shared/models/videos/video-privacy.enum'
-import { FollowState } from '../../shared/models/accounts/follow.model'
 // ---------------------------------------------------------------------------
diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index bb95992e1..f9e24c6b8 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -1,72 +1,43 @@
-import { join } from 'path'
+import { Sequelize as SequelizeTypescript } from 'sequelize-typescript'
-import { flattenDepth } from 'lodash'
+import { isTestInstance } from '../helpers/core-utils'
-require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string
+import { logger } from '../helpers/logger'
-import * as Sequelize from 'sequelize'
-import { AvatarModel } from '../models/avatar'
+import { AccountModel } from '../models/account/account'
+import { AccountFollowModel } from '../models/account/account-follow'
+import { AccountVideoRateModel } from '../models/account/account-video-rate'
+import { UserModel } from '../models/account/user'
+import { ApplicationModel } from '../models/application/application'
+import { AvatarModel } from '../models/avatar/avatar'
+import { JobModel } from '../models/job/job'
+import { OAuthClientModel } from '../models/oauth/oauth-client'
+import { OAuthTokenModel } from '../models/oauth/oauth-token'
+import { ServerModel } from '../models/server/server'
+import { TagModel } from '../models/video/tag'
+import { VideoModel } from '../models/video/video'
+import { VideoAbuseModel } from '../models/video/video-abuse'
+import { VideoBlacklistModel } from '../models/video/video-blacklist'
+import { VideoChannelModel } from '../models/video/video-channel'
+import { VideoChannelShareModel } from '../models/video/video-channel-share'
+import { VideoFileModel } from '../models/video/video-file'
+import { VideoShareModel } from '../models/video/video-share'
+import { VideoTagModel } from '../models/video/video-tag'
 import { CONFIG } from './constants'
-// Do not use barrel, we need to load database first
-import { logger } from '../helpers/logger'
-import { isTestInstance, readdirPromise } from '../helpers/core-utils'
-import { VideoModel } from './../models/video/video-interface'
+require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string
-import { VideoTagModel } from './../models/video/video-tag-interface'
-import { BlacklistedVideoModel } from './../models/video/video-blacklist-interface'
-import { VideoFileModel } from './../models/video/video-file-interface'
-import { VideoAbuseModel } from './../models/video/video-abuse-interface'
-import { VideoChannelModel } from './../models/video/video-channel-interface'
-import { UserModel } from '../models/account/user-interface'
-import { AccountVideoRateModel } from '../models/account/account-video-rate-interface'
-import { AccountFollowModel } from '../models/account/account-follow-interface'
-import { TagModel } from './../models/video/tag-interface'
-import { ServerModel } from '../models/server/server-interface'
-import { OAuthTokenModel } from './../models/oauth/oauth-token-interface'
-import { OAuthClientModel } from './../models/oauth/oauth-client-interface'
-import { JobModel } from './../models/job/job-interface'
-import { AccountModel } from './../models/account/account-interface'
-import { ApplicationModel } from './../models/application/application-interface'
-import { VideoChannelShareModel } from '../models/video/video-channel-share-interface'
-import { VideoShareModel } from '../models/video/video-share-interface'
 const dbname = CONFIG.DATABASE.DBNAME
 const username = CONFIG.DATABASE.USERNAME
 const password = CONFIG.DATABASE.PASSWORD
-export type PeerTubeDatabase = {
+const sequelizeTypescript = new SequelizeTypescript({
-  sequelize?: Sequelize.Sequelize,
+  database: dbname,
-  init?: (silent: boolean) => Promise<void>,
-  Application?: ApplicationModel,
-  Avatar?: AvatarModel,
-  Account?: AccountModel,
-  Job?: JobModel,
-  OAuthClient?: OAuthClientModel,
-  OAuthToken?: OAuthTokenModel,
-  Server?: ServerModel,
-  Tag?: TagModel,
-  AccountVideoRate?: AccountVideoRateModel,
-  AccountFollow?: AccountFollowModel,
-  User?: UserModel,
-  VideoAbuse?: VideoAbuseModel,
-  VideoChannel?: VideoChannelModel,
-  VideoChannelShare?: VideoChannelShareModel,
-  VideoShare?: VideoShareModel,
-  VideoFile?: VideoFileModel,
-  BlacklistedVideo?: BlacklistedVideoModel,
-  VideoTag?: VideoTagModel,
-  Video?: VideoModel
-}
-const database: PeerTubeDatabase = {}
-const sequelize = new Sequelize(dbname, username, password, {
  dialect: 'postgres',
-  host: CONFIG.DATABASE.HOSTNAME,
+  username,
-  port: CONFIG.DATABASE.PORT,
+  password,
+  modelPaths: [__dirname + '/models'],
  benchmark: isTestInstance(),
-  isolationLevel: Sequelize.Transaction.ISOLATION_LEVELS.SERIALIZABLE,
+  isolationLevel: SequelizeTypescript.Transaction.ISOLATION_LEVELS.SERIALIZABLE,
  operatorsAliases: false,
  logging: (message: string, benchmark: number) => {
    if (process.env.NODE_DB_LOG === 'false') return
@@ -79,34 +50,28 @@ const sequelize = new Sequelize(dbname, username, password, {
  }
 })
-database.sequelize = sequelize
+async function initDatabase (silent: boolean) {
+  sequelizeTypescript.addModels([
-database.init = async (silent: boolean) => {
+    ApplicationModel,
-  const modelDirectory = join(__dirname, '..', 'models')
+    AvatarModel,
+    AccountModel,
-  const filePaths = await getModelFiles(modelDirectory)
+    JobModel,
+    OAuthClientModel,
-  for (const filePath of filePaths) {
+    OAuthTokenModel,
-    try {
+    ServerModel,
-      const model = sequelize.import(filePath)
+    TagModel,
+    AccountVideoRateModel,
-      database[model['name']] = model
+    AccountFollowModel,
-    } catch (err) {
+    UserModel,
-      logger.error('Cannot import database model %s.', filePath, err)
+    VideoAbuseModel,
-      process.exit(0)
+    VideoChannelModel,
-    }
+    VideoChannelShareModel,
-  }
+    VideoShareModel,
+    VideoFileModel,
-  for (const modelName of Object.keys(database)) {
+    VideoBlacklistModel,
-    if ('associate' in database[modelName]) {
+    VideoTagModel,
-      try {
+    VideoModel
-        database[modelName].associate(database)
+  ])
-      } catch (err) {
-        logger.error('Cannot associate model %s.', modelName, err)
-        process.exit(0)
-      }
-    }
-  }
  if (!silent) logger.info('Database %s is ready.', dbname)
@@ -116,51 +81,6 @@ database.init = async (silent: boolean) => {
 // ---------------------------------------------------------------------------
 export {
-  database
+  initDatabase,
-}
+  sequelizeTypescript
-// ---------------------------------------------------------------------------
-async function getModelFiles (modelDirectory: string) {
-  const files = await readdirPromise(modelDirectory)
-  const directories = files.filter(directory => {
-    // Find directories
-    if (
-      directory.endsWith('.js.map') ||
-      directory === 'index.js' || directory === 'index.ts' ||
-      directory === 'utils.js' || directory === 'utils.ts'
-    ) return false
-    return true
-  })
-  const tasks: Promise<any>[] = []
-  // For each directory we read it and append model in the modelFilePaths array
-  for (const directory of directories) {
-    const modelDirectoryPath = join(modelDirectory, directory)
-    const promise = readdirPromise(modelDirectoryPath)
-      .then(files => {
-        const filteredFiles = files
-          .filter(file => {
-            if (
-              file === 'index.js' || file === 'index.ts' ||
-              file === 'utils.js' || file === 'utils.ts' ||
-              file.endsWith('-interface.js') || file.endsWith('-interface.ts') ||
-              file.endsWith('.js.map')
-            ) return false
-            return true
-          })
-          .map(file => join(modelDirectoryPath, file))
-        return filteredFiles
-      })
-    tasks.push(promise)
-  }
-  const filteredFilesArray: string[][] = await Promise.all(tasks)
-  return flattenDepth<string>(filteredFilesArray, 1)
 }
diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts
index 954516057..5452743b6 100644
--- a/server/initializers/installer.ts
+++ b/server/initializers/installer.ts
@@ -1,16 +1,17 @@
 import * as passwordGenerator from 'password-generator'
 import { UserRole } from '../../shared'
-import { logger, mkdirpPromise, rimrafPromise } from '../helpers'
+import { createPrivateAndPublicKeys, logger, mkdirpPromise, rimrafPromise } from '../helpers'
-import { createUserAccountAndChannel } from '../lib'
+import { createLocalAccountWithoutKeys, createUserAccountAndChannel } from '../lib'
-import { createLocalAccountWithoutKeys } from '../lib/user'
+import { UserModel } from '../models/account/user'
+import { ApplicationModel } from '../models/application/application'
+import { OAuthClientModel } from '../models/oauth/oauth-client'
 import { applicationExist, clientsExist, usersExist } from './checker'
 import { CACHE, CONFIG, LAST_MIGRATION_VERSION, SERVER_ACCOUNT_NAME } from './constants'
-import { database as db } from './database'
+import { sequelizeTypescript } from './database'
-import { createPrivateAndPublicKeys } from '../helpers/peertube-crypto'
 async function installApplication () {
  try {
-    await db.sequelize.sync()
+    await sequelizeTypescript.sync()
    await removeCacheDirectories()
    await createDirectoriesIfNotExist()
    await createApplicationIfNotExist()
@@ -64,7 +65,7 @@ function createDirectoriesIfNotExist () {
 }
 async function createOAuthClientIfNotExist () {
-  const exist = await clientsExist(db.OAuthClient)
+  const exist = await clientsExist()
  // Nothing to do, clients already exist
  if (exist === true) return undefined
@@ -72,7 +73,7 @@ async function createOAuthClientIfNotExist () {
  const id = passwordGenerator(32, false, /[a-z0-9]/)
  const secret = passwordGenerator(32, false, /[a-zA-Z0-9]/)
-  const client = db.OAuthClient.build({
+  const client = new OAuthClientModel({
    clientId: id,
    clientSecret: secret,
    grants: [ 'password', 'refresh_token' ],
@@ -87,7 +88,7 @@ async function createOAuthClientIfNotExist () {
 }
 async function createOAuthAdminIfNotExist () {
-  const exist = await usersExist(db.User)
+  const exist = await usersExist()
  // Nothing to do, users already exist
  if (exist === true) return undefined
@@ -120,7 +121,7 @@ async function createOAuthAdminIfNotExist () {
    role,
    videoQuota: -1
  }
-  const user = db.User.build(userData)
+  const user = new UserModel(userData)
  await createUserAccountAndChannel(user, validatePassword)
  logger.info('Username: ' + username)
@@ -128,12 +129,12 @@ async function createOAuthAdminIfNotExist () {
 }
 async function createApplicationIfNotExist () {
-  const exist = await applicationExist(db.Application)
+  const exist = await applicationExist()
  // Nothing to do, application already exist
  if (exist === true) return undefined
  logger.info('Creating Application table.')
-  const applicationInstance = await db.Application.create({ migrationVersion: LAST_MIGRATION_VERSION })
+  const applicationInstance = await ApplicationModel.create({ migrationVersion: LAST_MIGRATION_VERSION })
  logger.info('Creating application account.')
diff --git a/server/initializers/migrations/0065-video-file-size.ts b/server/initializers/migrations/0065-video-file-size.ts
index 58f8f3bcc..4e2075f8b 100644
--- a/server/initializers/migrations/0065-video-file-size.ts
+++ b/server/initializers/migrations/0065-video-file-size.ts
@@ -1,8 +1,7 @@
 import * as Sequelize from 'sequelize'
 import * as Promise from 'bluebird'
 import { stat } from 'fs'
+import { VideoModel } from '../../models/video/video'
-import { VideoInstance } from '../../models'
 function up (utils: {
  transaction: Sequelize.Transaction,
@@ -11,7 +10,7 @@ function up (utils: {
  db: any
 }): Promise<void> {
  return utils.db.Video.listOwnedAndPopulateAuthorAndTags()
-    .then((videos: VideoInstance[]) => {
+    .then((videos: VideoModel[]) => {
      const tasks: Promise<any>[] = []
      videos.forEach(video => {
diff --git a/server/initializers/migrations/0100-activitypub.ts b/server/initializers/migrations/0100-activitypub.ts
index 50a0adc14..fb42e1d57 100644
--- a/server/initializers/migrations/0100-activitypub.ts
+++ b/server/initializers/migrations/0100-activitypub.ts
@@ -4,14 +4,14 @@ import { createPrivateAndPublicKeys } from '../../helpers/peertube-crypto'
 import { shareVideoByServer } from '../../lib/activitypub/share'
 import { getVideoActivityPubUrl, getVideoChannelActivityPubUrl } from '../../lib/activitypub/url'
 import { createLocalAccountWithoutKeys } from '../../lib/user'
+import { ApplicationModel } from '../../models/application/application'
 import { JOB_CATEGORIES, SERVER_ACCOUNT_NAME } from '../constants'
-import { PeerTubeDatabase } from '../database'
 async function up (utils: {
  transaction: Sequelize.Transaction,
  queryInterface: Sequelize.QueryInterface,
  sequelize: Sequelize.Sequelize,
-  db: PeerTubeDatabase
+  db: any
 }): Promise<void> {
  const q = utils.queryInterface
  const db = utils.db
@@ -65,7 +65,7 @@ async function up (utils: {
  // Create application account
  {
-    const applicationInstance = await db.Application.findOne()
+    const applicationInstance = await ApplicationModel.findOne()
    const accountCreated = await createLocalAccountWithoutKeys(SERVER_ACCOUNT_NAME, null, applicationInstance.id, undefined)
    const { publicKey, privateKey } = await createPrivateAndPublicKeys()
diff --git a/server/initializers/migrations/0105-server-mail.ts b/server/initializers/migrations/0105-server-mail.ts
index 5836992d5..4b9600e91 100644
--- a/server/initializers/migrations/0105-server-mail.ts
+++ b/server/initializers/migrations/0105-server-mail.ts
@@ -1,11 +1,10 @@
 import * as Sequelize from 'sequelize'
-import { PeerTubeDatabase } from '../database'
 async function up (utils: {
  transaction: Sequelize.Transaction,
  queryInterface: Sequelize.QueryInterface,
  sequelize: Sequelize.Sequelize,
-  db: PeerTubeDatabase
+  db: any
 }): Promise<void> {
  await utils.queryInterface.removeColumn('Servers', 'email')
 }
diff --git a/server/initializers/migrations/0110-server-key.ts b/server/initializers/migrations/0110-server-key.ts
index 560353945..5ff6daf69 100644
--- a/server/initializers/migrations/0110-server-key.ts
+++ b/server/initializers/migrations/0110-server-key.ts
@@ -1,11 +1,10 @@
 import * as Sequelize from 'sequelize'
-import { PeerTubeDatabase } from '../database'
 async function up (utils: {
  transaction: Sequelize.Transaction,
  queryInterface: Sequelize.QueryInterface,
  sequelize: Sequelize.Sequelize,
-  db: PeerTubeDatabase
+  db: any
 }): Promise<void> {
  await utils.queryInterface.removeColumn('Servers', 'publicKey')
 }
diff --git a/server/initializers/migrations/0115-account-avatar.ts b/server/initializers/migrations/0115-account-avatar.ts
index 2b947ceda..b318e8163 100644
--- a/server/initializers/migrations/0115-account-avatar.ts
+++ b/server/initializers/migrations/0115-account-avatar.ts
@@ -1,11 +1,10 @@
 import * as Sequelize from 'sequelize'
-import { PeerTubeDatabase } from '../database'
 async function up (utils: {
  transaction: Sequelize.Transaction,
  queryInterface: Sequelize.QueryInterface,
  sequelize: Sequelize.Sequelize,
-  db: PeerTubeDatabase
+  db: any
 }): Promise<void> {
  await utils.db.Avatar.sync()
diff --git a/server/initializers/migrations/0120-video-null.ts b/server/initializers/migrations/0120-video-null.ts
index 9130d10ee..63f3984dd 100644
--- a/server/initializers/migrations/0120-video-null.ts
+++ b/server/initializers/migrations/0120-video-null.ts
@@ -1,12 +1,11 @@
 import * as Sequelize from 'sequelize'
 import { CONSTRAINTS_FIELDS } from '../constants'
-import { PeerTubeDatabase } from '../database'
 async function up (utils: {
  transaction: Sequelize.Transaction,
  queryInterface: Sequelize.QueryInterface,
  sequelize: Sequelize.Sequelize,
-  db: PeerTubeDatabase
+  db: any
 }): Promise<void> {
  {
diff --git a/server/initializers/migrator.ts b/server/initializers/migrator.ts
index 187c9be6e..f3a05cc8c 100644
--- a/server/initializers/migrator.ts
+++ b/server/initializers/migrator.ts
@@ -1,19 +1,19 @@
 import * as path from 'path'
-import { database as db } from './database'
-import { LAST_MIGRATION_VERSION } from './constants'
 import { logger, readdirPromise } from '../helpers'
+import { ApplicationModel } from '../models/application/application'
+import { LAST_MIGRATION_VERSION } from './constants'
+import { sequelizeTypescript } from './database'
 async function migrate () {
-  const tables = await db.sequelize.getQueryInterface().showAllTables()
+  const tables = await sequelizeTypescript.getQueryInterface().showAllTables()
  // No tables, we don't need to migrate anything
  // The installer will do that
  if (tables.length === 0) return
-  let actualVersion = await db.Application.loadMigrationVersion()
+  let actualVersion = await ApplicationModel.loadMigrationVersion()
  if (actualVersion === null) {
-    await db.Application.create({ migrationVersion: 0 })
+    await ApplicationModel.create({ migrationVersion: 0 })
    actualVersion = 0
  }
@@ -78,17 +78,16 @@ async function executeMigration (actualVersion: number, entity: { version: strin
  const migrationScript = require(path.join(__dirname, 'migrations', migrationScriptName))
-  await db.sequelize.transaction(async t => {
+  await sequelizeTypescript.transaction(async t => {
    const options = {
      transaction: t,
-      queryInterface: db.sequelize.getQueryInterface(),
+      queryInterface: sequelizeTypescript.getQueryInterface(),
-      sequelize: db.sequelize,
+      sequelize: sequelizeTypescript
-      db
    }
    await migrationScript.up(options)
    // Update the new migration version
-    await db.Application.updateMigrationVersion(versionScript, t)
+    await ApplicationModel.updateMigrationVersion(versionScript, t)
  })
 }
diff --git a/server/lib/activitypub/account.ts b/server/lib/activitypub/account.ts
index 906c8ff29..45690b88d 100644
--- a/server/lib/activitypub/account.ts
+++ b/server/lib/activitypub/account.ts
@@ -1,17 +1,15 @@
 import * as Bluebird from 'bluebird'
-import * as url from 'url'
-import { ActivityPubActor } from '../../../shared/models/activitypub/activitypub-actor'
-import { isRemoteAccountValid } from '../../helpers/custom-validators/activitypub/account'
-import { retryTransactionWrapper } from '../../helpers/database-utils'
-import { logger } from '../../helpers/logger'
-import { doRequest } from '../../helpers/requests'
-import { ACTIVITY_PUB } from '../../initializers/constants'
-import { database as db } from '../../initializers/database'
-import { AccountInstance } from '../../models/account/account-interface'
 import { Transaction } from 'sequelize'
+import * as url from 'url'
+import { ActivityPubActor } from '../../../shared/models/activitypub'
+import { doRequest, logger, retryTransactionWrapper } from '../../helpers'
+import { isRemoteAccountValid } from '../../helpers/custom-validators/activitypub'
+import { ACTIVITY_PUB, sequelizeTypescript } from '../../initializers'
+import { AccountModel } from '../../models/account/account'
+import { ServerModel } from '../../models/server/server'
 async function getOrCreateAccountAndServer (accountUrl: string) {
-  let account = await db.Account.loadByUrl(accountUrl)
+  let account = await AccountModel.loadByUrl(accountUrl)
  // We don't have this account in our database, fetch it on remote
  if (!account) {
@@ -28,11 +26,11 @@ async function getOrCreateAccountAndServer (accountUrl: string) {
  return account
 }
-function saveAccountAndServerIfNotExist (account: AccountInstance, t?: Transaction): Bluebird<AccountInstance> | Promise<AccountInstance> {
+function saveAccountAndServerIfNotExist (account: AccountModel, t?: Transaction): Bluebird<AccountModel> | Promise<AccountModel> {
  if (t !== undefined) {
    return save(t)
  } else {
-    return db.sequelize.transaction(t => {
+    return sequelizeTypescript.transaction(t => {
      return save(t)
    })
  }
@@ -49,7 +47,7 @@ function saveAccountAndServerIfNotExist (account: AccountInstance, t?: Transacti
      },
      transaction: t
    }
-    const [ server ] = await db.Server.findOrCreate(serverOptions)
+    const [ server ] = await ServerModel.findOrCreate(serverOptions)
    // Save our new account in database
    account.set('serverId', server.id)
@@ -87,7 +85,7 @@ async function fetchRemoteAccount (accountUrl: string) {
  const followersCount = await fetchAccountCount(accountJSON.followers)
  const followingCount = await fetchAccountCount(accountJSON.following)
-  const account = db.Account.build({
+  return new AccountModel({
    uuid: accountJSON.uuid,
    name: accountJSON.preferredUsername,
    url: accountJSON.url,
@@ -101,8 +99,6 @@ async function fetchRemoteAccount (accountUrl: string) {
    followersUrl: accountJSON.followers,
    followingUrl: accountJSON.following
  })
-  return account
 }
 export {
diff --git a/server/lib/activitypub/fetch.ts b/server/lib/activitypub/fetch.ts
index fd2af0761..aa4dea8e0 100644
--- a/server/lib/activitypub/fetch.ts
+++ b/server/lib/activitypub/fetch.ts
@@ -1,8 +1,8 @@
 import { Transaction } from 'sequelize'
-import { AccountInstance } from '../../models/account/account-interface'
+import { AccountModel } from '../../models/account/account'
-import { activitypubHttpJobScheduler, ActivityPubHttpPayload } from '../jobs/activitypub-http-job-scheduler/activitypub-http-job-scheduler'
+import { activitypubHttpJobScheduler, ActivityPubHttpPayload } from '../jobs/activitypub-http-job-scheduler'
-async function addFetchOutboxJob (account: AccountInstance, t: Transaction) {
+async function addFetchOutboxJob (account: AccountModel, t: Transaction) {
  const jobPayload: ActivityPubHttpPayload = {
    uris: [ account.outboxUrl ]
  }
diff --git a/server/lib/activitypub/process/misc.ts b/server/lib/activitypub/process/misc.ts
index 0baa22c26..a775c858a 100644
--- a/server/lib/activitypub/process/misc.ts
+++ b/server/lib/activitypub/process/misc.ts
@@ -1,18 +1,18 @@
 import * as magnetUtil from 'magnet-uri'
 import { VideoTorrentObject } from '../../../../shared'
-import { VideoChannelObject } from '../../../../shared/models/activitypub/objects/video-channel-object'
+import { VideoChannelObject } from '../../../../shared/models/activitypub/objects'
-import { VideoPrivacy } from '../../../../shared/models/videos/video-privacy.enum'
+import { VideoPrivacy } from '../../../../shared/models/videos'
+import { doRequest } from '../../../helpers'
 import { isVideoFileInfoHashValid } from '../../../helpers/custom-validators/videos'
-import { doRequest } from '../../../helpers/requests'
+import { ACTIVITY_PUB, VIDEO_MIMETYPE_EXT } from '../../../initializers'
-import { database as db } from '../../../initializers'
+import { AccountModel } from '../../../models/account/account'
-import { ACTIVITY_PUB, VIDEO_MIMETYPE_EXT } from '../../../initializers/constants'
+import { VideoModel } from '../../../models/video/video'
-import { AccountInstance } from '../../../models/account/account-interface'
+import { VideoChannelModel } from '../../../models/video/video-channel'
-import { VideoChannelInstance } from '../../../models/video/video-channel-interface'
+import { VideoChannelShareModel } from '../../../models/video/video-channel-share'
-import { VideoFileAttributes } from '../../../models/video/video-file-interface'
+import { VideoShareModel } from '../../../models/video/video-share'
-import { VideoAttributes, VideoInstance } from '../../../models/video/video-interface'
 import { getOrCreateAccountAndServer } from '../account'
-function videoChannelActivityObjectToDBAttributes (videoChannelObject: VideoChannelObject, account: AccountInstance) {
+function videoChannelActivityObjectToDBAttributes (videoChannelObject: VideoChannelObject, account: AccountModel) {
  return {
    name: videoChannelObject.name,
    description: videoChannelObject.content,
@@ -26,7 +26,7 @@ function videoChannelActivityObjectToDBAttributes (videoChannelObject: VideoChan
 }
 async function videoActivityObjectToDBAttributes (
-  videoChannel: VideoChannelInstance,
+  videoChannel: VideoChannelModel,
  videoObject: VideoTorrentObject,
  to: string[] = [],
  cc: string[] = []
@@ -56,7 +56,7 @@ async function videoActivityObjectToDBAttributes (
    description = videoObject.content
  }
-  const videoData: VideoAttributes = {
+  return {
    name: videoObject.name,
    uuid: videoObject.uuid,
    url: videoObject.id,
@@ -76,11 +76,9 @@ async function videoActivityObjectToDBAttributes (
    remote: true,
    privacy
  }
-  return videoData
 }
-function videoFileActivityUrlToDBAttributes (videoCreated: VideoInstance, videoObject: VideoTorrentObject) {
+function videoFileActivityUrlToDBAttributes (videoCreated: VideoModel, videoObject: VideoTorrentObject) {
  const mimeTypes = Object.keys(VIDEO_MIMETYPE_EXT)
  const fileUrls = videoObject.url.filter(u => {
    return mimeTypes.indexOf(u.mimeType) !== -1 && u.mimeType.startsWith('video/')
@@ -90,7 +88,7 @@ function videoFileActivityUrlToDBAttributes (videoCreated: VideoInstance, videoO
    throw new Error('Cannot find video files for ' + videoCreated.url)
  }
-  const attributes: VideoFileAttributes[] = []
+  const attributes = []
  for (const fileUrl of fileUrls) {
    // Fetch associated magnet uri
    const magnet = videoObject.url.find(u => {
@@ -115,7 +113,7 @@ function videoFileActivityUrlToDBAttributes (videoCreated: VideoInstance, videoO
  return attributes
 }
-async function addVideoShares (instance: VideoInstance, shares: string[]) {
+async function addVideoShares (instance: VideoModel, shares: string[]) {
  for (const share of shares) {
    // Fetch url
    const json = await doRequest({
@@ -132,14 +130,14 @@ async function addVideoShares (instance: VideoInstance, shares: string[]) {
      videoId: instance.id
    }
-    await db.VideoShare.findOrCreate({
+    await VideoShareModel.findOrCreate({
      where: entry,
      defaults: entry
    })
  }
 }
-async function addVideoChannelShares (instance: VideoChannelInstance, shares: string[]) {
+async function addVideoChannelShares (instance: VideoChannelModel, shares: string[]) {
  for (const share of shares) {
    // Fetch url
    const json = await doRequest({
@@ -156,7 +154,7 @@ async function addVideoChannelShares (instance: VideoChannelInstance, shares: st
      videoChannelId: instance.id
    }
-    await db.VideoChannelShare.findOrCreate({
+    await VideoChannelShareModel.findOrCreate({
      where: entry,
      defaults: entry
    })
diff --git a/server/lib/activitypub/process/process-accept.ts b/server/lib/activitypub/process/process-accept.ts
index 73c6cb279..5b321f771 100644
--- a/server/lib/activitypub/process/process-accept.ts
+++ b/server/lib/activitypub/process/process-accept.ts
@@ -1,12 +1,12 @@
-import { ActivityAccept } from '../../../../shared/models/activitypub/activity'
+import { ActivityAccept } from '../../../../shared/models/activitypub'
-import { database as db } from '../../../initializers'
+import { AccountModel } from '../../../models/account/account'
-import { AccountInstance } from '../../../models/account/account-interface'
+import { AccountFollowModel } from '../../../models/account/account-follow'
 import { addFetchOutboxJob } from '../fetch'
-async function processAcceptActivity (activity: ActivityAccept, inboxAccount?: AccountInstance) {
+async function processAcceptActivity (activity: ActivityAccept, inboxAccount?: AccountModel) {
  if (inboxAccount === undefined) throw new Error('Need to accept on explicit inbox.')
-  const targetAccount = await db.Account.loadByUrl(activity.actor)
+  const targetAccount = await AccountModel.loadByUrl(activity.actor)
  return processAccept(inboxAccount, targetAccount)
 }
@@ -19,8 +19,8 @@ export {
 // ---------------------------------------------------------------------------
-async function processAccept (account: AccountInstance, targetAccount: AccountInstance) {
+async function processAccept (account: AccountModel, targetAccount: AccountModel) {
-  const follow = await db.AccountFollow.loadByAccountAndTarget(account.id, targetAccount.id)
+  const follow = await AccountFollowModel.loadByAccountAndTarget(account.id, targetAccount.id)
  if (!follow) throw new Error('Cannot find associated follow.')
  follow.set('state', 'accepted')
diff --git a/server/lib/activitypub/process/process-add.ts b/server/lib/activitypub/process/process-add.ts
index e6bf63eb2..550593eab 100644
--- a/server/lib/activitypub/process/process-add.ts
+++ b/server/lib/activitypub/process/process-add.ts
@@ -1,13 +1,15 @@
 import * as Bluebird from 'bluebird'
 import { VideoTorrentObject } from '../../../../shared'
-import { ActivityAdd } from '../../../../shared/models/activitypub/activity'
+import { ActivityAdd } from '../../../../shared/models/activitypub'
-import { VideoRateType } from '../../../../shared/models/videos/video-rate.type'
+import { VideoRateType } from '../../../../shared/models/videos'
-import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { logger, retryTransactionWrapper } from '../../../helpers'
-import { logger } from '../../../helpers/logger'
+import { sequelizeTypescript } from '../../../initializers'
-import { database as db } from '../../../initializers'
+import { AccountModel } from '../../../models/account/account'
-import { AccountInstance } from '../../../models/account/account-interface'
+import { AccountVideoRateModel } from '../../../models/account/account-video-rate'
-import { VideoChannelInstance } from '../../../models/video/video-channel-interface'
+import { TagModel } from '../../../models/video/tag'
-import { VideoInstance } from '../../../models/video/video-interface'
+import { VideoModel } from '../../../models/video/video'
+import { VideoChannelModel } from '../../../models/video/video-channel'
+import { VideoFileModel } from '../../../models/video/video-file'
 import { getOrCreateAccountAndServer } from '../account'
 import { getOrCreateVideoChannel } from '../video-channels'
 import { generateThumbnailFromUrl } from '../videos'
@@ -37,9 +39,9 @@ export {
 // ---------------------------------------------------------------------------
-async function processAddVideo (account: AccountInstance,
+async function processAddVideo (account: AccountModel,
                                activity: ActivityAdd,
-                                videoChannel: VideoChannelInstance,
+                                videoChannel: VideoChannelModel,
                                videoToCreateData: VideoTorrentObject) {
  const options = {
    arguments: [ account, activity, videoChannel, videoToCreateData ],
@@ -64,24 +66,24 @@ async function processAddVideo (account: AccountInstance,
  return video
 }
-function addRemoteVideo (account: AccountInstance,
+function addRemoteVideo (account: AccountModel,
                         activity: ActivityAdd,
-                         videoChannel: VideoChannelInstance,
+                         videoChannel: VideoChannelModel,
                         videoToCreateData: VideoTorrentObject) {
  logger.debug('Adding remote video %s.', videoToCreateData.id)
-  return db.sequelize.transaction(async t => {
+  return sequelizeTypescript.transaction(async t => {
    const sequelizeOptions = {
      transaction: t
    }
    if (videoChannel.Account.id !== account.id) throw new Error('Video channel is not owned by this account.')
-    const videoFromDatabase = await db.Video.loadByUUIDOrURL(videoToCreateData.uuid, videoToCreateData.id, t)
+    const videoFromDatabase = await VideoModel.loadByUUIDOrURL(videoToCreateData.uuid, videoToCreateData.id, t)
    if (videoFromDatabase) return videoFromDatabase
    const videoData = await videoActivityObjectToDBAttributes(videoChannel, videoToCreateData, activity.to, activity.cc)
-    const video = db.Video.build(videoData)
+    const video = VideoModel.build(videoData)
    // Don't block on request
    generateThumbnailFromUrl(video, videoToCreateData.icon)
@@ -94,12 +96,12 @@ function addRemoteVideo (account: AccountInstance,
      throw new Error('Cannot find valid files for video %s ' + videoToCreateData.url)
    }
-    const tasks: Bluebird<any>[] = videoFileAttributes.map(f => db.VideoFile.create(f, { transaction: t }))
+    const tasks: Bluebird<any>[] = videoFileAttributes.map(f => VideoFileModel.create(f, { transaction: t }))
    await Promise.all(tasks)
    const tags = videoToCreateData.tag.map(t => t.name)
-    const tagInstances = await db.Tag.findOrCreateTags(tags, t)
+    const tagInstances = await TagModel.findOrCreateTags(tags, t)
-    await videoCreated.setTags(tagInstances, sequelizeOptions)
+    await videoCreated.$set('Tags', tagInstances, sequelizeOptions)
    logger.info('Remote video with uuid %s inserted.', videoToCreateData.uuid)
@@ -107,13 +109,13 @@ function addRemoteVideo (account: AccountInstance,
  })
 }
-async function createRates (accountUrls: string[], video: VideoInstance, rate: VideoRateType) {
+async function createRates (accountUrls: string[], video: VideoModel, rate: VideoRateType) {
  let rateCounts = 0
  const tasks: Bluebird<any>[] = []
  for (const accountUrl of accountUrls) {
    const account = await getOrCreateAccountAndServer(accountUrl)
-    const p = db.AccountVideoRate
+    const p = AccountVideoRateModel
      .create({
        videoId: video.id,
        accountId: account.id,
diff --git a/server/lib/activitypub/process/process-announce.ts b/server/lib/activitypub/process/process-announce.ts
index 2aa9ad5c7..ff2c6d708 100644
--- a/server/lib/activitypub/process/process-announce.ts
+++ b/server/lib/activitypub/process/process-announce.ts
@@ -1,10 +1,11 @@
-import { ActivityAdd, ActivityAnnounce, ActivityCreate } from '../../../../shared/models/activitypub/activity'
+import { ActivityAdd, ActivityAnnounce, ActivityCreate } from '../../../../shared/models/activitypub'
-import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { logger, retryTransactionWrapper } from '../../../helpers'
-import { logger } from '../../../helpers/logger'
+import { sequelizeTypescript } from '../../../initializers'
-import { database as db } from '../../../initializers/index'
+import { AccountModel } from '../../../models/account/account'
-import { AccountInstance } from '../../../models/account/account-interface'
+import { VideoModel } from '../../../models/video/video'
-import { VideoInstance } from '../../../models/index'
+import { VideoChannelModel } from '../../../models/video/video-channel'
-import { VideoChannelInstance } from '../../../models/video/video-channel-interface'
+import { VideoChannelShareModel } from '../../../models/video/video-channel-share'
+import { VideoShareModel } from '../../../models/video/video-share'
 import { getOrCreateAccountAndServer } from '../account'
 import { forwardActivity } from '../send/misc'
 import { processAddActivity } from './process-add'
@@ -36,7 +37,7 @@ export {
 // ---------------------------------------------------------------------------
-function processVideoChannelShare (accountAnnouncer: AccountInstance, activity: ActivityAnnounce) {
+function processVideoChannelShare (accountAnnouncer: AccountModel, activity: ActivityAnnounce) {
  const options = {
    arguments: [ accountAnnouncer, activity ],
    errorMessage: 'Cannot share the video channel with many retries.'
@@ -45,18 +46,18 @@ function processVideoChannelShare (accountAnnouncer: AccountInstance, activity:
  return retryTransactionWrapper(shareVideoChannel, options)
 }
-async function shareVideoChannel (accountAnnouncer: AccountInstance, activity: ActivityAnnounce) {
+async function shareVideoChannel (accountAnnouncer: AccountModel, activity: ActivityAnnounce) {
  const announcedActivity = activity.object as ActivityCreate
-  return db.sequelize.transaction(async t => {
+  return sequelizeTypescript.transaction(async t => {
    // Add share entry
-    const videoChannel: VideoChannelInstance = await processCreateActivity(announcedActivity)
+    const videoChannel: VideoChannelModel = await processCreateActivity(announcedActivity)
    const share = {
      accountId: accountAnnouncer.id,
      videoChannelId: videoChannel.id
    }
-    const [ , created ] = await db.VideoChannelShare.findOrCreate({
+    const [ , created ] = await VideoChannelShareModel.findOrCreate({
      where: share,
      defaults: share,
      transaction: t
@@ -72,7 +73,7 @@ async function shareVideoChannel (accountAnnouncer: AccountInstance, activity: A
  })
 }
-function processVideoShare (accountAnnouncer: AccountInstance, activity: ActivityAnnounce) {
+function processVideoShare (accountAnnouncer: AccountModel, activity: ActivityAnnounce) {
  const options = {
    arguments: [ accountAnnouncer, activity ],
    errorMessage: 'Cannot share the video with many retries.'
@@ -81,19 +82,19 @@ function processVideoShare (accountAnnouncer: AccountInstance, activity: Activit
  return retryTransactionWrapper(shareVideo, options)
 }
-function shareVideo (accountAnnouncer: AccountInstance, activity: ActivityAnnounce) {
+function shareVideo (accountAnnouncer: AccountModel, activity: ActivityAnnounce) {
  const announcedActivity = activity.object as ActivityAdd
-  return db.sequelize.transaction(async t => {
+  return sequelizeTypescript.transaction(async t => {
    // Add share entry
-    const video: VideoInstance = await processAddActivity(announcedActivity)
+    const video: VideoModel = await processAddActivity(announcedActivity)
    const share = {
      accountId: accountAnnouncer.id,
      videoId: video.id
    }
-    const [ , created ] = await db.VideoShare.findOrCreate({
+    const [ , created ] = await VideoShareModel.findOrCreate({
      where: share,
      defaults: share,
      transaction: t
diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts
index 4740dc432..c1eb2a8ab 100644
--- a/server/lib/activitypub/process/process-create.ts
+++ b/server/lib/activitypub/process/process-create.ts
@@ -1,10 +1,12 @@
 import { ActivityCreate, VideoChannelObject } from '../../../../shared'
-import { DislikeObject } from '../../../../shared/models/activitypub/objects/dislike-object'
+import { DislikeObject, VideoAbuseObject, ViewObject } from '../../../../shared/models/activitypub/objects'
-import { VideoAbuseObject } from '../../../../shared/models/activitypub/objects/video-abuse-object'
-import { ViewObject } from '../../../../shared/models/activitypub/objects/view-object'
 import { logger, retryTransactionWrapper } from '../../../helpers'
-import { database as db } from '../../../initializers'
+import { sequelizeTypescript } from '../../../initializers'
-import { AccountInstance } from '../../../models/account/account-interface'
+import { AccountModel } from '../../../models/account/account'
+import { AccountVideoRateModel } from '../../../models/account/account-video-rate'
+import { VideoModel } from '../../../models/video/video'
+import { VideoAbuseModel } from '../../../models/video/video-abuse'
+import { VideoChannelModel } from '../../../models/video/video-channel'
 import { getOrCreateAccountAndServer } from '../account'
 import { forwardActivity } from '../send/misc'
 import { getVideoChannelActivityPubUrl } from '../url'
@@ -37,7 +39,7 @@ export {
 // ---------------------------------------------------------------------------
-async function processCreateDislike (byAccount: AccountInstance, activity: ActivityCreate) {
+async function processCreateDislike (byAccount: AccountModel, activity: ActivityCreate) {
  const options = {
    arguments: [ byAccount, activity ],
    errorMessage: 'Cannot dislike the video with many retries.'
@@ -46,11 +48,11 @@ async function processCreateDislike (byAccount: AccountInstance, activity: Activ
  return retryTransactionWrapper(createVideoDislike, options)
 }
-function createVideoDislike (byAccount: AccountInstance, activity: ActivityCreate) {
+function createVideoDislike (byAccount: AccountModel, activity: ActivityCreate) {
  const dislike = activity.object as DislikeObject
-  return db.sequelize.transaction(async t => {
+  return sequelizeTypescript.transaction(async t => {
-    const video = await db.Video.loadByUrlAndPopulateAccount(dislike.object, t)
+    const video = await VideoModel.loadByUrlAndPopulateAccount(dislike.object, t)
    if (!video) throw new Error('Unknown video ' + dislike.object)
    const rate = {
@@ -58,7 +60,7 @@ function createVideoDislike (byAccount: AccountInstance, activity: ActivityCreat
      videoId: video.id,
      accountId: byAccount.id
    }
-    const [ , created ] = await db.AccountVideoRate.findOrCreate({
+    const [ , created ] = await AccountVideoRateModel.findOrCreate({
      where: rate,
      defaults: rate,
      transaction: t
@@ -73,14 +75,14 @@ function createVideoDislike (byAccount: AccountInstance, activity: ActivityCreat
  })
 }
-async function processCreateView (byAccount: AccountInstance, activity: ActivityCreate) {
+async function processCreateView (byAccount: AccountModel, activity: ActivityCreate) {
  const view = activity.object as ViewObject
-  const video = await db.Video.loadByUrlAndPopulateAccount(view.object)
+  const video = await VideoModel.loadByUrlAndPopulateAccount(view.object)
  if (!video) throw new Error('Unknown video ' + view.object)
-  const account = await db.Account.loadByUrl(view.actor)
+  const account = await AccountModel.loadByUrl(view.actor)
  if (!account) throw new Error('Unknown account ' + view.actor)
  await video.increment('views')
@@ -92,7 +94,7 @@ async function processCreateView (byAccount: AccountInstance, activity: Activity
  }
 }
-async function processCreateVideoChannel (account: AccountInstance, videoChannelToCreateData: VideoChannelObject) {
+async function processCreateVideoChannel (account: AccountModel, videoChannelToCreateData: VideoChannelObject) {
  const options = {
    arguments: [ account, videoChannelToCreateData ],
    errorMessage: 'Cannot insert the remote video channel with many retries.'
@@ -107,15 +109,15 @@ async function processCreateVideoChannel (account: AccountInstance, videoChannel
  return videoChannel
 }
-function addRemoteVideoChannel (account: AccountInstance, videoChannelToCreateData: VideoChannelObject) {
+function addRemoteVideoChannel (account: AccountModel, videoChannelToCreateData: VideoChannelObject) {
  logger.debug('Adding remote video channel "%s".', videoChannelToCreateData.uuid)
-  return db.sequelize.transaction(async t => {
+  return sequelizeTypescript.transaction(async t => {
-    let videoChannel = await db.VideoChannel.loadByUUIDOrUrl(videoChannelToCreateData.uuid, videoChannelToCreateData.id, t)
+    let videoChannel = await VideoChannelModel.loadByUUIDOrUrl(videoChannelToCreateData.uuid, videoChannelToCreateData.id, t)
    if (videoChannel) return videoChannel
    const videoChannelData = videoChannelActivityObjectToDBAttributes(videoChannelToCreateData, account)
-    videoChannel = db.VideoChannel.build(videoChannelData)
+    videoChannel = new VideoChannelModel(videoChannelData)
    videoChannel.url = getVideoChannelActivityPubUrl(videoChannel)
    videoChannel = await videoChannel.save({ transaction: t })
@@ -125,7 +127,7 @@ function addRemoteVideoChannel (account: AccountInstance, videoChannelToCreateDa
  })
 }
-function processCreateVideoAbuse (account: AccountInstance, videoAbuseToCreateData: VideoAbuseObject) {
+function processCreateVideoAbuse (account: AccountModel, videoAbuseToCreateData: VideoAbuseObject) {
  const options = {
    arguments: [ account, videoAbuseToCreateData ],
    errorMessage: 'Cannot insert the remote video abuse with many retries.'
@@ -134,11 +136,11 @@ function processCreateVideoAbuse (account: AccountInstance, videoAbuseToCreateDa
  return retryTransactionWrapper(addRemoteVideoAbuse, options)
 }
-function addRemoteVideoAbuse (account: AccountInstance, videoAbuseToCreateData: VideoAbuseObject) {
+function addRemoteVideoAbuse (account: AccountModel, videoAbuseToCreateData: VideoAbuseObject) {
  logger.debug('Reporting remote abuse for video %s.', videoAbuseToCreateData.object)
-  return db.sequelize.transaction(async t => {
+  return sequelizeTypescript.transaction(async t => {
-    const video = await db.Video.loadByUrlAndPopulateAccount(videoAbuseToCreateData.object, t)
+    const video = await VideoModel.loadByUrlAndPopulateAccount(videoAbuseToCreateData.object, t)
    if (!video) {
      logger.warn('Unknown video %s for remote video abuse.', videoAbuseToCreateData.object)
      return undefined
@@ -150,7 +152,7 @@ function addRemoteVideoAbuse (account: AccountInstance, videoAbuseToCreateData:
      videoId: video.id
    }
-    await db.VideoAbuse.create(videoAbuseData)
+    await VideoAbuseModel.create(videoAbuseData)
    logger.info('Remote abuse for video uuid %s created', videoAbuseToCreateData.object)
  })
diff --git a/server/lib/activitypub/process/process-delete.ts b/server/lib/activitypub/process/process-delete.ts
index 41cdc236d..8f280d37f 100644
--- a/server/lib/activitypub/process/process-delete.ts
+++ b/server/lib/activitypub/process/process-delete.ts
@@ -1,10 +1,9 @@
-import { ActivityDelete } from '../../../../shared/models/activitypub/activity'
+import { ActivityDelete } from '../../../../shared/models/activitypub'
-import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { logger, retryTransactionWrapper } from '../../../helpers'
-import { logger } from '../../../helpers/logger'
+import { sequelizeTypescript } from '../../../initializers'
-import { database as db } from '../../../initializers'
+import { AccountModel } from '../../../models/account/account'
-import { AccountInstance } from '../../../models/account/account-interface'
+import { VideoModel } from '../../../models/video/video'
-import { VideoChannelInstance } from '../../../models/video/video-channel-interface'
+import { VideoChannelModel } from '../../../models/video/video-channel'
-import { VideoInstance } from '../../../models/video/video-interface'
 import { getOrCreateAccountAndServer } from '../account'
 async function processDeleteActivity (activity: ActivityDelete) {
@@ -15,14 +14,14 @@ async function processDeleteActivity (activity: ActivityDelete) {
  }
  {
-    let videoObject = await db.Video.loadByUrlAndPopulateAccount(activity.id)
+    let videoObject = await VideoModel.loadByUrlAndPopulateAccount(activity.id)
    if (videoObject !== undefined) {
      return processDeleteVideo(account, videoObject)
    }
  }
  {
-    let videoChannelObject = await db.VideoChannel.loadByUrl(activity.id)
+    let videoChannelObject = await VideoChannelModel.loadByUrl(activity.id)
    if (videoChannelObject !== undefined) {
      return processDeleteVideoChannel(account, videoChannelObject)
    }
@@ -39,7 +38,7 @@ export {
 // ---------------------------------------------------------------------------
-async function processDeleteVideo (account: AccountInstance, videoToDelete: VideoInstance) {
+async function processDeleteVideo (account: AccountModel, videoToDelete: VideoModel) {
  const options = {
    arguments: [ account, videoToDelete ],
    errorMessage: 'Cannot remove the remote video with many retries.'
@@ -48,10 +47,10 @@ async function processDeleteVideo (account: AccountInstance, videoToDelete: Vide
  await retryTransactionWrapper(deleteRemoteVideo, options)
 }
-async function deleteRemoteVideo (account: AccountInstance, videoToDelete: VideoInstance) {
+async function deleteRemoteVideo (account: AccountModel, videoToDelete: VideoModel) {
  logger.debug('Removing remote video "%s".', videoToDelete.uuid)
-  await db.sequelize.transaction(async t => {
+  await sequelizeTypescript.transaction(async t => {
    if (videoToDelete.VideoChannel.Account.id !== account.id) {
      throw new Error('Account ' + account.url + ' does not own video channel ' + videoToDelete.VideoChannel.url)
    }
@@ -62,7 +61,7 @@ async function deleteRemoteVideo (account: AccountInstance, videoToDelete: Video
  logger.info('Remote video with uuid %s removed.', videoToDelete.uuid)
 }
-async function processDeleteVideoChannel (account: AccountInstance, videoChannelToRemove: VideoChannelInstance) {
+async function processDeleteVideoChannel (account: AccountModel, videoChannelToRemove: VideoChannelModel) {
  const options = {
    arguments: [ account, videoChannelToRemove ],
    errorMessage: 'Cannot remove the remote video channel with many retries.'
@@ -71,10 +70,10 @@ async function processDeleteVideoChannel (account: AccountInstance, videoChannel
  await retryTransactionWrapper(deleteRemoteVideoChannel, options)
 }
-async function deleteRemoteVideoChannel (account: AccountInstance, videoChannelToRemove: VideoChannelInstance) {
+async function deleteRemoteVideoChannel (account: AccountModel, videoChannelToRemove: VideoChannelModel) {
  logger.debug('Removing remote video channel "%s".', videoChannelToRemove.uuid)
-  await db.sequelize.transaction(async t => {
+  await sequelizeTypescript.transaction(async t => {
    if (videoChannelToRemove.Account.id !== account.id) {
      throw new Error('Account ' + account.url + ' does not own video channel ' + videoChannelToRemove.url)
    }
@@ -85,7 +84,7 @@ async function deleteRemoteVideoChannel (account: AccountInstance, videoChannelT
  logger.info('Remote video channel with uuid %s removed.', videoChannelToRemove.uuid)
 }
-async function processDeleteAccount (accountToRemove: AccountInstance) {
+async function processDeleteAccount (accountToRemove: AccountModel) {
  const options = {
    arguments: [ accountToRemove ],
    errorMessage: 'Cannot remove the remote account with many retries.'
@@ -94,10 +93,10 @@ async function processDeleteAccount (accountToRemove: AccountInstance) {
  await retryTransactionWrapper(deleteRemoteAccount, options)
 }
-async function deleteRemoteAccount (accountToRemove: AccountInstance) {
+async function deleteRemoteAccount (accountToRemove: AccountModel) {
  logger.debug('Removing remote account "%s".', accountToRemove.uuid)
-  await db.sequelize.transaction(async t => {
+  await sequelizeTypescript.transaction(async t => {
    await accountToRemove.destroy({ transaction: t })
  })
diff --git a/server/lib/activitypub/process/process-follow.ts b/server/lib/activitypub/process/process-follow.ts
index 320dc1138..ccaee43a6 100644
--- a/server/lib/activitypub/process/process-follow.ts
+++ b/server/lib/activitypub/process/process-follow.ts
@@ -1,10 +1,10 @@
-import { ActivityFollow } from '../../../../shared/models/activitypub/activity'
+import { ActivityFollow } from '../../../../shared/models/activitypub'
-import { retryTransactionWrapper } from '../../../helpers'
+import { logger, retryTransactionWrapper } from '../../../helpers'
-import { database as db } from '../../../initializers'
+import { sequelizeTypescript } from '../../../initializers'
-import { AccountInstance } from '../../../models/account/account-interface'
+import { AccountModel } from '../../../models/account/account'
-import { logger } from '../../../helpers/logger'
+import { AccountFollowModel } from '../../../models/account/account-follow'
-import { sendAccept } from '../send/send-accept'
 import { getOrCreateAccountAndServer } from '../account'
+import { sendAccept } from '../send'
 async function processFollowActivity (activity: ActivityFollow) {
  const activityObject = activity.object
@@ -21,7 +21,7 @@ export {
 // ---------------------------------------------------------------------------
-function processFollow (account: AccountInstance, targetAccountURL: string) {
+function processFollow (account: AccountModel, targetAccountURL: string) {
  const options = {
    arguments: [ account, targetAccountURL ],
    errorMessage: 'Cannot follow with many retries.'
@@ -30,14 +30,14 @@ function processFollow (account: AccountInstance, targetAccountURL: string) {
  return retryTransactionWrapper(follow, options)
 }
-async function follow (account: AccountInstance, targetAccountURL: string) {
+async function follow (account: AccountModel, targetAccountURL: string) {
-  await db.sequelize.transaction(async t => {
+  await sequelizeTypescript.transaction(async t => {
-    const targetAccount = await db.Account.loadByUrl(targetAccountURL, t)
+    const targetAccount = await AccountModel.loadByUrl(targetAccountURL, t)
    if (!targetAccount) throw new Error('Unknown account')
    if (targetAccount.isOwned() === false) throw new Error('This is not a local account.')
-    const [ accountFollow ] = await db.AccountFollow.findOrCreate({
+    const [ accountFollow ] = await AccountFollowModel.findOrCreate({
      where: {
        accountId: account.id,
        targetAccountId: targetAccount.id
diff --git a/server/lib/activitypub/process/process-like.ts b/server/lib/activitypub/process/process-like.ts
index 5f2ffe7ea..a6e391f1e 100644
--- a/server/lib/activitypub/process/process-like.ts
+++ b/server/lib/activitypub/process/process-like.ts
@@ -1,7 +1,9 @@
-import { ActivityLike } from '../../../../shared/models/activitypub/activity'
+import { ActivityLike } from '../../../../shared/models/activitypub'
-import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { retryTransactionWrapper } from '../../../helpers'
-import { database as db } from '../../../initializers'
+import { sequelizeTypescript } from '../../../initializers'
-import { AccountInstance } from '../../../models/account/account-interface'
+import { AccountModel } from '../../../models/account/account'
+import { AccountVideoRateModel } from '../../../models/account/account-video-rate'
+import { VideoModel } from '../../../models/video/video'
 import { getOrCreateAccountAndServer } from '../account'
 import { forwardActivity } from '../send/misc'
@@ -19,7 +21,7 @@ export {
 // ---------------------------------------------------------------------------
-async function processLikeVideo (byAccount: AccountInstance, activity: ActivityLike) {
+async function processLikeVideo (byAccount: AccountModel, activity: ActivityLike) {
  const options = {
    arguments: [ byAccount, activity ],
    errorMessage: 'Cannot like the video with many retries.'
@@ -28,11 +30,11 @@ async function processLikeVideo (byAccount: AccountInstance, activity: ActivityL
  return retryTransactionWrapper(createVideoLike, options)
 }
-function createVideoLike (byAccount: AccountInstance, activity: ActivityLike) {
+function createVideoLike (byAccount: AccountModel, activity: ActivityLike) {
  const videoUrl = activity.object
-  return db.sequelize.transaction(async t => {
+  return sequelizeTypescript.transaction(async t => {
-    const video = await db.Video.loadByUrlAndPopulateAccount(videoUrl)
+    const video = await VideoModel.loadByUrlAndPopulateAccount(videoUrl)
    if (!video) throw new Error('Unknown video ' + videoUrl)
@@ -41,7 +43,7 @@ function createVideoLike (byAccount: AccountInstance, activity: ActivityLike) {
      videoId: video.id,
      accountId: byAccount.id
    }
-    const [ , created ] = await db.AccountVideoRate.findOrCreate({
+    const [ , created ] = await AccountVideoRateModel.findOrCreate({
      where: rate,
      defaults: rate,
      transaction: t
diff --git a/server/lib/activitypub/process/process-undo.ts b/server/lib/activitypub/process/process-undo.ts
index cc221045f..efa63122b 100644
--- a/server/lib/activitypub/process/process-undo.ts
+++ b/server/lib/activitypub/process/process-undo.ts
@@ -1,8 +1,11 @@
-import { ActivityFollow, ActivityLike, ActivityUndo } from '../../../../shared/models/activitypub/activity'
+import { ActivityFollow, ActivityLike, ActivityUndo } from '../../../../shared/models/activitypub'
-import { DislikeObject } from '../../../../shared/models/activitypub/objects/dislike-object'
+import { DislikeObject } from '../../../../shared/models/activitypub/objects'
-import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { logger, retryTransactionWrapper } from '../../../helpers'
-import { logger } from '../../../helpers/logger'
+import { sequelizeTypescript } from '../../../initializers'
-import { database as db } from '../../../initializers'
+import { AccountModel } from '../../../models/account/account'
+import { AccountFollowModel } from '../../../models/account/account-follow'
+import { AccountVideoRateModel } from '../../../models/account/account-video-rate'
+import { VideoModel } from '../../../models/video/video'
 import { forwardActivity } from '../send/misc'
 async function processUndoActivity (activity: ActivityUndo) {
@@ -41,14 +44,14 @@ function processUndoLike (actor: string, activity: ActivityUndo) {
 function undoLike (actor: string, activity: ActivityUndo) {
  const likeActivity = activity.object as ActivityLike
-  return db.sequelize.transaction(async t => {
+  return sequelizeTypescript.transaction(async t => {
-    const byAccount = await db.Account.loadByUrl(actor, t)
+    const byAccount = await AccountModel.loadByUrl(actor, t)
    if (!byAccount) throw new Error('Unknown account ' + actor)
-    const video = await db.Video.loadByUrlAndPopulateAccount(likeActivity.object, t)
+    const video = await VideoModel.loadByUrlAndPopulateAccount(likeActivity.object, t)
    if (!video) throw new Error('Unknown video ' + likeActivity.actor)
-    const rate = await db.AccountVideoRate.load(byAccount.id, video.id, t)
+    const rate = await AccountVideoRateModel.load(byAccount.id, video.id, t)
    if (!rate) throw new Error(`Unknown rate by account ${byAccount.id} for video ${video.id}.`)
    await rate.destroy({ transaction: t })
@@ -74,14 +77,14 @@ function processUndoDislike (actor: string, activity: ActivityUndo) {
 function undoDislike (actor: string, activity: ActivityUndo) {
  const dislike = activity.object.object as DislikeObject
-  return db.sequelize.transaction(async t => {
+  return sequelizeTypescript.transaction(async t => {
-    const byAccount = await db.Account.loadByUrl(actor, t)
+    const byAccount = await AccountModel.loadByUrl(actor, t)
    if (!byAccount) throw new Error('Unknown account ' + actor)
-    const video = await db.Video.loadByUrlAndPopulateAccount(dislike.object, t)
+    const video = await VideoModel.loadByUrlAndPopulateAccount(dislike.object, t)
    if (!video) throw new Error('Unknown video ' + dislike.actor)
-    const rate = await db.AccountVideoRate.load(byAccount.id, video.id, t)
+    const rate = await AccountVideoRateModel.load(byAccount.id, video.id, t)
    if (!rate) throw new Error(`Unknown rate by account ${byAccount.id} for video ${video.id}.`)
    await rate.destroy({ transaction: t })
@@ -105,10 +108,10 @@ function processUndoFollow (actor: string, followActivity: ActivityFollow) {
 }
 function undoFollow (actor: string, followActivity: ActivityFollow) {
-  return db.sequelize.transaction(async t => {
+  return sequelizeTypescript.transaction(async t => {
-    const follower = await db.Account.loadByUrl(actor, t)
+    const follower = await AccountModel.loadByUrl(actor, t)
-    const following = await db.Account.loadByUrl(followActivity.object, t)
+    const following = await AccountModel.loadByUrl(followActivity.object, t)
-    const accountFollow = await db.AccountFollow.loadByAccountAndTarget(follower.id, following.id, t)
+    const accountFollow = await AccountFollowModel.loadByAccountAndTarget(follower.id, following.id, t)
    if (!accountFollow) throw new Error(`'Unknown account follow ${follower.id} -> ${following.id}.`)
diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts
index 11c6de8f5..771021f0c 100644
--- a/server/lib/activitypub/process/process-update.ts
+++ b/server/lib/activitypub/process/process-update.ts
@@ -1,12 +1,13 @@
 import * as Bluebird from 'bluebird'
 import { VideoChannelObject, VideoTorrentObject } from '../../../../shared'
-import { ActivityUpdate } from '../../../../shared/models/activitypub/activity'
+import { ActivityUpdate } from '../../../../shared/models/activitypub'
-import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { logger, resetSequelizeInstance, retryTransactionWrapper } from '../../../helpers'
-import { logger } from '../../../helpers/logger'
+import { sequelizeTypescript } from '../../../initializers'
-import { resetSequelizeInstance } from '../../../helpers/utils'
+import { AccountModel } from '../../../models/account/account'
-import { database as db } from '../../../initializers'
+import { TagModel } from '../../../models/video/tag'
-import { AccountInstance } from '../../../models/account/account-interface'
+import { VideoModel } from '../../../models/video/video'
-import { VideoInstance } from '../../../models/video/video-interface'
+import { VideoChannelModel } from '../../../models/video/video-channel'
+import { VideoFileModel } from '../../../models/video/video-file'
 import { getOrCreateAccountAndServer } from '../account'
 import { videoActivityObjectToDBAttributes, videoFileActivityUrlToDBAttributes } from './misc'
@@ -30,7 +31,7 @@ export {
 // ---------------------------------------------------------------------------
-function processUpdateVideo (account: AccountInstance, video: VideoTorrentObject) {
+function processUpdateVideo (account: AccountModel, video: VideoTorrentObject) {
  const options = {
    arguments: [ account, video ],
    errorMessage: 'Cannot update the remote video with many retries'
@@ -39,18 +40,18 @@ function processUpdateVideo (account: AccountInstance, video: VideoTorrentObject
  return retryTransactionWrapper(updateRemoteVideo, options)
 }
-async function updateRemoteVideo (account: AccountInstance, videoAttributesToUpdate: VideoTorrentObject) {
+async function updateRemoteVideo (account: AccountModel, videoAttributesToUpdate: VideoTorrentObject) {
  logger.debug('Updating remote video "%s".', videoAttributesToUpdate.uuid)
-  let videoInstance: VideoInstance
+  let videoInstance: VideoModel
  let videoFieldsSave: object
  try {
-    await db.sequelize.transaction(async t => {
+    await sequelizeTypescript.transaction(async t => {
      const sequelizeOptions = {
        transaction: t
      }
-      const videoInstance = await db.Video.loadByUrlAndPopulateAccount(videoAttributesToUpdate.id, t)
+      const videoInstance = await VideoModel.loadByUrlAndPopulateAccount(videoAttributesToUpdate.id, t)
      if (!videoInstance) throw new Error('Video ' + videoAttributesToUpdate.id + ' not found.')
      if (videoInstance.VideoChannel.Account.id !== account.id) {
@@ -81,12 +82,12 @@ async function updateRemoteVideo (account: AccountInstance, videoAttributesToUpd
      await Promise.all(videoFileDestroyTasks)
      const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoInstance, videoAttributesToUpdate)
-      const tasks: Bluebird<any>[] = videoFileAttributes.map(f => db.VideoFile.create(f))
+      const tasks: Bluebird<any>[] = videoFileAttributes.map(f => VideoFileModel.create(f))
      await Promise.all(tasks)
      const tags = videoAttributesToUpdate.tag.map(t => t.name)
-      const tagInstances = await db.Tag.findOrCreateTags(tags, t)
+      const tagInstances = await TagModel.findOrCreateTags(tags, t)
-      await videoInstance.setTags(tagInstances, sequelizeOptions)
+      await videoInstance.$set('Tags', tagInstances, sequelizeOptions)
    })
    logger.info('Remote video with uuid %s updated', videoAttributesToUpdate.uuid)
@@ -101,7 +102,7 @@ async function updateRemoteVideo (account: AccountInstance, videoAttributesToUpd
  }
 }
-async function processUpdateVideoChannel (account: AccountInstance, videoChannel: VideoChannelObject) {
+async function processUpdateVideoChannel (account: AccountModel, videoChannel: VideoChannelObject) {
  const options = {
    arguments: [ account, videoChannel ],
    errorMessage: 'Cannot update the remote video channel with many retries.'
@@ -110,13 +111,13 @@ async function processUpdateVideoChannel (account: AccountInstance, videoChannel
  await retryTransactionWrapper(updateRemoteVideoChannel, options)
 }
-async function updateRemoteVideoChannel (account: AccountInstance, videoChannel: VideoChannelObject) {
+async function updateRemoteVideoChannel (account: AccountModel, videoChannel: VideoChannelObject) {
  logger.debug('Updating remote video channel "%s".', videoChannel.uuid)
-  await db.sequelize.transaction(async t => {
+  await sequelizeTypescript.transaction(async t => {
    const sequelizeOptions = { transaction: t }
-    const videoChannelInstance = await db.VideoChannel.loadByUrl(videoChannel.id)
+    const videoChannelInstance = await VideoChannelModel.loadByUrl(videoChannel.id)
    if (!videoChannelInstance) throw new Error('Video ' + videoChannel.id + ' not found.')
    if (videoChannelInstance.Account.id !== account.id) {
diff --git a/server/lib/activitypub/process/process.ts b/server/lib/activitypub/process/process.ts
index 54981c289..bfbf8053c 100644
--- a/server/lib/activitypub/process/process.ts
+++ b/server/lib/activitypub/process/process.ts
@@ -1,6 +1,6 @@
-import { Activity, ActivityType } from '../../../../shared/models/activitypub/activity'
+import { Activity, ActivityType } from '../../../../shared/models/activitypub'
-import { logger } from '../../../helpers/logger'
+import { logger } from '../../../helpers'
-import { AccountInstance } from '../../../models/account/account-interface'
+import { AccountModel } from '../../../models/account/account'
 import { processAcceptActivity } from './process-accept'
 import { processAddActivity } from './process-add'
 import { processAnnounceActivity } from './process-announce'
@@ -11,7 +11,7 @@ import { processLikeActivity } from './process-like'
 import { processUndoActivity } from './process-undo'
 import { processUpdateActivity } from './process-update'
-const processActivity: { [ P in ActivityType ]: (activity: Activity, inboxAccount?: AccountInstance) => Promise<any> } = {
+const processActivity: { [ P in ActivityType ]: (activity: Activity, inboxAccount?: AccountModel) => Promise<any> } = {
  Create: processCreateActivity,
  Add: processAddActivity,
  Update: processUpdateActivity,
@@ -23,7 +23,7 @@ const processActivity: { [ P in ActivityType ]: (activity: Activity, inboxAccoun
  Like: processLikeActivity
 }
-async function processActivities (activities: Activity[], signatureAccount?: AccountInstance, inboxAccount?: AccountInstance) {
+async function processActivities (activities: Activity[], signatureAccount?: AccountModel, inboxAccount?: AccountModel) {
  for (const activity of activities) {
    // When we fetch remote data, we don't have signature
    if (signatureAccount && activity.actor !== signatureAccount.url) {
diff --git a/server/lib/activitypub/send/misc.ts b/server/lib/activitypub/send/misc.ts
index 999def701..ffc221477 100644
--- a/server/lib/activitypub/send/misc.ts
+++ b/server/lib/activitypub/send/misc.ts
@@ -1,19 +1,19 @@
 import { Transaction } from 'sequelize'
-import { Activity } from '../../../../shared/models/activitypub/activity'
+import { Activity } from '../../../../shared/models/activitypub'
-import { logger } from '../../../helpers/logger'
+import { logger } from '../../../helpers'
-import { ACTIVITY_PUB, database as db } from '../../../initializers'
+import { ACTIVITY_PUB } from '../../../initializers'
-import { AccountInstance } from '../../../models/account/account-interface'
+import { AccountModel } from '../../../models/account/account'
-import { VideoChannelInstance } from '../../../models/index'
+import { AccountFollowModel } from '../../../models/account/account-follow'
-import { VideoInstance } from '../../../models/video/video-interface'
+import { VideoModel } from '../../../models/video/video'
-import {
+import { VideoChannelModel } from '../../../models/video/video-channel'
-  activitypubHttpJobScheduler,
+import { VideoChannelShareModel } from '../../../models/video/video-channel-share'
-  ActivityPubHttpPayload
+import { VideoShareModel } from '../../../models/video/video-share'
-} from '../../jobs/activitypub-http-job-scheduler/activitypub-http-job-scheduler'
+import { activitypubHttpJobScheduler, ActivityPubHttpPayload } from '../../jobs/activitypub-http-job-scheduler'
 async function forwardActivity (
  activity: Activity,
  t: Transaction,
-  followersException: AccountInstance[] = []
+  followersException: AccountModel[] = []
 ) {
  const to = activity.to || []
  const cc = activity.cc || []
@@ -25,7 +25,7 @@ async function forwardActivity (
    }
  }
-  const toAccountFollowers = await db.Account.listByFollowersUrls(followersUrls, t)
+  const toAccountFollowers = await AccountModel.listByFollowersUrls(followersUrls, t)
  const uris = await computeFollowerUris(toAccountFollowers, followersException, t)
  if (uris.length === 0) {
@@ -45,10 +45,10 @@ async function forwardActivity (
 async function broadcastToFollowers (
  data: any,
-  byAccount: AccountInstance,
+  byAccount: AccountModel,
-  toAccountFollowers: AccountInstance[],
+  toAccountFollowers: AccountModel[],
  t: Transaction,
-  followersException: AccountInstance[] = []
+  followersException: AccountModel[] = []
 ) {
  const uris = await computeFollowerUris(toAccountFollowers, followersException, t)
  if (uris.length === 0) {
@@ -67,7 +67,7 @@ async function broadcastToFollowers (
  return activitypubHttpJobScheduler.createJob(t, 'activitypubHttpBroadcastHandler', jobPayload)
 }
-async function unicastTo (data: any, byAccount: AccountInstance, toAccountUrl: string, t: Transaction) {
+async function unicastTo (data: any, byAccount: AccountModel, toAccountUrl: string, t: Transaction) {
  logger.debug('Creating unicast job.', { uri: toAccountUrl })
  const jobPayload: ActivityPubHttpPayload = {
@@ -79,42 +79,42 @@ async function unicastTo (data: any, byAccount: AccountInstance, toAccountUrl: s
  return activitypubHttpJobScheduler.createJob(t, 'activitypubHttpUnicastHandler', jobPayload)
 }
-function getOriginVideoAudience (video: VideoInstance, accountsInvolvedInVideo: AccountInstance[]) {
+function getOriginVideoAudience (video: VideoModel, accountsInvolvedInVideo: AccountModel[]) {
  return {
    to: [ video.VideoChannel.Account.url ],
    cc: accountsInvolvedInVideo.map(a => a.followersUrl)
  }
 }
-function getOriginVideoChannelAudience (videoChannel: VideoChannelInstance, accountsInvolved: AccountInstance[]) {
+function getOriginVideoChannelAudience (videoChannel: VideoChannelModel, accountsInvolved: AccountModel[]) {
  return {
    to: [ videoChannel.Account.url ],
    cc: accountsInvolved.map(a => a.followersUrl)
  }
 }
-function getObjectFollowersAudience (accountsInvolvedInObject: AccountInstance[]) {
+function getObjectFollowersAudience (accountsInvolvedInObject: AccountModel[]) {
  return {
    to: accountsInvolvedInObject.map(a => a.followersUrl),
    cc: []
  }
 }
-async function getAccountsInvolvedInVideo (video: VideoInstance, t: Transaction) {
+async function getAccountsInvolvedInVideo (video: VideoModel, t: Transaction) {
-  const accountsToForwardView = await db.VideoShare.loadAccountsByShare(video.id, t)
+  const accountsToForwardView = await VideoShareModel.loadAccountsByShare(video.id, t)
  accountsToForwardView.push(video.VideoChannel.Account)
  return accountsToForwardView
 }
-async function getAccountsInvolvedInVideoChannel (videoChannel: VideoChannelInstance, t: Transaction) {
+async function getAccountsInvolvedInVideoChannel (videoChannel: VideoChannelModel, t: Transaction) {
-  const accountsToForwardView = await db.VideoChannelShare.loadAccountsByShare(videoChannel.id, t)
+  const accountsToForwardView = await VideoChannelShareModel.loadAccountsByShare(videoChannel.id, t)
  accountsToForwardView.push(videoChannel.Account)
  return accountsToForwardView
 }
-async function getAudience (accountSender: AccountInstance, t: Transaction, isPublic = true) {
+async function getAudience (accountSender: AccountModel, t: Transaction, isPublic = true) {
  const followerInboxUrls = await accountSender.getFollowerSharedInboxUrls(t)
  // Thanks Mastodon: https://github.com/tootsuite/mastodon/blob/master/app/lib/activitypub/tag_manager.rb#L47
@@ -132,14 +132,12 @@ async function getAudience (accountSender: AccountInstance, t: Transaction, isPu
  return { to, cc }
 }
-async function computeFollowerUris (toAccountFollower: AccountInstance[], followersException: AccountInstance[], t: Transaction) {
+async function computeFollowerUris (toAccountFollower: AccountModel[], followersException: AccountModel[], t: Transaction) {
  const toAccountFollowerIds = toAccountFollower.map(a => a.id)
-  const result = await db.AccountFollow.listAcceptedFollowerSharedInboxUrls(toAccountFollowerIds, t)
+  const result = await AccountFollowModel.listAcceptedFollowerSharedInboxUrls(toAccountFollowerIds, t)
  const followersSharedInboxException = followersException.map(f => f.sharedInboxUrl)
-  const uris = result.data.filter(sharedInbox => followersSharedInboxException.indexOf(sharedInbox) === -1)
+  return result.data.filter(sharedInbox => followersSharedInboxException.indexOf(sharedInbox) === -1)
-  return uris
 }
 // ---------------------------------------------------------------------------
diff --git a/server/lib/activitypub/send/send-accept.ts b/server/lib/activitypub/send/send-accept.ts
index d3f8fbe38..f160af3c9 100644
--- a/server/lib/activitypub/send/send-accept.ts
+++ b/server/lib/activitypub/send/send-accept.ts
@@ -1,11 +1,11 @@
 import { Transaction } from 'sequelize'
-import { ActivityAccept } from '../../../../shared/models/activitypub/activity'
+import { ActivityAccept } from '../../../../shared/models/activitypub'
-import { AccountInstance } from '../../../models'
+import { AccountModel } from '../../../models/account/account'
-import { AccountFollowInstance } from '../../../models/account/account-follow-interface'
+import { AccountFollowModel } from '../../../models/account/account-follow'
-import { unicastTo } from './misc'
 import { getAccountFollowAcceptActivityPubUrl } from '../url'
+import { unicastTo } from './misc'
-async function sendAccept (accountFollow: AccountFollowInstance, t: Transaction) {
+async function sendAccept (accountFollow: AccountFollowModel, t: Transaction) {
  const follower = accountFollow.AccountFollower
  const me = accountFollow.AccountFollowing
@@ -23,7 +23,7 @@ export {
 // ---------------------------------------------------------------------------
-function acceptActivityData (url: string, byAccount: AccountInstance) {
+function acceptActivityData (url: string, byAccount: AccountModel) {
  const activity: ActivityAccept = {
    type: 'Accept',
    id: url,
diff --git a/server/lib/activitypub/send/send-add.ts b/server/lib/activitypub/send/send-add.ts
index d8ac2853e..fd614db75 100644
--- a/server/lib/activitypub/send/send-add.ts
+++ b/server/lib/activitypub/send/send-add.ts
@@ -1,10 +1,11 @@
 import { Transaction } from 'sequelize'
-import { ActivityAdd } from '../../../../shared/models/activitypub/activity'
+import { ActivityAdd } from '../../../../shared/models/activitypub'
-import { VideoPrivacy } from '../../../../shared/models/videos/video-privacy.enum'
+import { VideoPrivacy } from '../../../../shared/models/videos'
-import { AccountInstance, VideoInstance } from '../../../models'
+import { AccountModel } from '../../../models/account/account'
+import { VideoModel } from '../../../models/video/video'
 import { broadcastToFollowers, getAudience } from './misc'
-async function sendAddVideo (video: VideoInstance, t: Transaction) {
+async function sendAddVideo (video: VideoModel, t: Transaction) {
  const byAccount = video.VideoChannel.Account
  const videoObject = video.toActivityPubObject()
@@ -15,16 +16,17 @@ async function sendAddVideo (video: VideoInstance, t: Transaction) {
 async function addActivityData (
  url: string,
-  byAccount: AccountInstance,
+  byAccount: AccountModel,
-  video: VideoInstance,
+  video: VideoModel,
  target: string,
  object: any,
  t: Transaction
-) {
+): Promise<ActivityAdd> {
  const videoPublic = video.privacy === VideoPrivacy.PUBLIC
  const { to, cc } = await getAudience(byAccount, t, videoPublic)
-  const activity: ActivityAdd = {
+  return {
    type: 'Add',
    id: url,
    actor: byAccount.url,
@@ -33,8 +35,6 @@ async function addActivityData (
    object,
    target
  }
-  return activity
 }
 // ---------------------------------------------------------------------------
diff --git a/server/lib/activitypub/send/send-announce.ts b/server/lib/activitypub/send/send-announce.ts
index 3acf604cd..e685323e8 100644
--- a/server/lib/activitypub/send/send-announce.ts
+++ b/server/lib/activitypub/send/send-announce.ts
@@ -1,8 +1,9 @@
 import { Transaction } from 'sequelize'
 import { ActivityAdd } from '../../../../shared/index'
-import { ActivityAnnounce, ActivityAudience, ActivityCreate } from '../../../../shared/models/activitypub/activity'
+import { ActivityAnnounce, ActivityAudience, ActivityCreate } from '../../../../shared/models/activitypub'
-import { AccountInstance, VideoInstance } from '../../../models'
+import { AccountModel } from '../../../models/account/account'
-import { VideoChannelInstance } from '../../../models/video/video-channel-interface'
+import { VideoModel } from '../../../models/video/video'
+import { VideoChannelModel } from '../../../models/video/video-channel'
 import { getAnnounceActivityPubUrl } from '../url'
 import {
  broadcastToFollowers,
@@ -17,7 +18,7 @@ import {
 import { addActivityData } from './send-add'
 import { createActivityData } from './send-create'
-async function buildVideoAnnounceToFollowers (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
+async function buildVideoAnnounceToFollowers (byAccount: AccountModel, video: VideoModel, t: Transaction) {
  const url = getAnnounceActivityPubUrl(video.url, byAccount)
  const videoChannel = video.VideoChannel
@@ -25,18 +26,16 @@ async function buildVideoAnnounceToFollowers (byAccount: AccountInstance, video:
  const accountsToForwardView = await getAccountsInvolvedInVideo(video, t)
  const audience = getObjectFollowersAudience(accountsToForwardView)
-  const data = await announceActivityData(url, byAccount, announcedActivity, t, audience)
+  return announceActivityData(url, byAccount, announcedActivity, t, audience)
-  return data
 }
-async function sendVideoAnnounceToFollowers (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
+async function sendVideoAnnounceToFollowers (byAccount: AccountModel, video: VideoModel, t: Transaction) {
  const data = await buildVideoAnnounceToFollowers(byAccount, video, t)
  return broadcastToFollowers(data, byAccount, [ byAccount ], t)
 }
-async function sendVideoAnnounceToOrigin (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
+async function sendVideoAnnounceToOrigin (byAccount: AccountModel, video: VideoModel, t: Transaction) {
  const url = getAnnounceActivityPubUrl(video.url, byAccount)
  const videoChannel = video.VideoChannel
@@ -49,24 +48,22 @@ async function sendVideoAnnounceToOrigin (byAccount: AccountInstance, video: Vid
  return unicastTo(data, byAccount, videoChannel.Account.sharedInboxUrl, t)
 }
-async function buildVideoChannelAnnounceToFollowers (byAccount: AccountInstance, videoChannel: VideoChannelInstance, t: Transaction) {
+async function buildVideoChannelAnnounceToFollowers (byAccount: AccountModel, videoChannel: VideoChannelModel, t: Transaction) {
  const url = getAnnounceActivityPubUrl(videoChannel.url, byAccount)
  const announcedActivity = await createActivityData(url, videoChannel.Account, videoChannel.toActivityPubObject(), t)
  const accountsToForwardView = await getAccountsInvolvedInVideoChannel(videoChannel, t)
  const audience = getObjectFollowersAudience(accountsToForwardView)
-  const data = await announceActivityData(url, byAccount, announcedActivity, t, audience)
+  return announceActivityData(url, byAccount, announcedActivity, t, audience)
-  return data
 }
-async function sendVideoChannelAnnounceToFollowers (byAccount: AccountInstance, videoChannel: VideoChannelInstance, t: Transaction) {
+async function sendVideoChannelAnnounceToFollowers (byAccount: AccountModel, videoChannel: VideoChannelModel, t: Transaction) {
  const data = await buildVideoChannelAnnounceToFollowers(byAccount, videoChannel, t)
  return broadcastToFollowers(data, byAccount, [ byAccount ], t)
 }
-async function sendVideoChannelAnnounceToOrigin (byAccount: AccountInstance, videoChannel: VideoChannelInstance, t: Transaction) {
+async function sendVideoChannelAnnounceToOrigin (byAccount: AccountModel, videoChannel: VideoChannelModel, t: Transaction) {
  const url = getAnnounceActivityPubUrl(videoChannel.url, byAccount)
  const announcedActivity = await createActivityData(url, videoChannel.Account, videoChannel.toActivityPubObject(), t)
@@ -79,16 +76,16 @@ async function sendVideoChannelAnnounceToOrigin (byAccount: AccountInstance, vid
 async function announceActivityData (
  url: string,
-  byAccount: AccountInstance,
+  byAccount: AccountModel,
  object: ActivityCreate | ActivityAdd,
  t: Transaction,
  audience?: ActivityAudience
-) {
+): Promise<ActivityAnnounce> {
  if (!audience) {
    audience = await getAudience(byAccount, t)
  }
-  const activity: ActivityAnnounce = {
+  return {
    type: 'Announce',
    to: audience.to,
    cc: audience.cc,
@@ -96,8 +93,6 @@ async function announceActivityData (
    actor: byAccount.url,
    object
  }
-  return activity
 }
 // ---------------------------------------------------------------------------
diff --git a/server/lib/activitypub/send/send-create.ts b/server/lib/activitypub/send/send-create.ts
index a34d3776c..9fbaa8196 100644
--- a/server/lib/activitypub/send/send-create.ts
+++ b/server/lib/activitypub/send/send-create.ts
@@ -1,8 +1,10 @@
 import { Transaction } from 'sequelize'
-import { ActivityAudience, ActivityCreate } from '../../../../shared/models/activitypub/activity'
+import { ActivityAudience, ActivityCreate } from '../../../../shared/models/activitypub'
-import { getServerAccount } from '../../../helpers/utils'
+import { getServerAccount } from '../../../helpers'
-import { AccountInstance, VideoChannelInstance, VideoInstance } from '../../../models'
+import { AccountModel } from '../../../models/account/account'
-import { VideoAbuseInstance } from '../../../models/video/video-abuse-interface'
+import { VideoModel } from '../../../models/video/video'
+import { VideoAbuseModel } from '../../../models/video/video-abuse'
+import { VideoChannelModel } from '../../../models/video/video-channel'
 import { getVideoAbuseActivityPubUrl, getVideoDislikeActivityPubUrl, getVideoViewActivityPubUrl } from '../url'
 import {
  broadcastToFollowers,
@@ -13,7 +15,7 @@ import {
  unicastTo
 } from './misc'
-async function sendCreateVideoChannel (videoChannel: VideoChannelInstance, t: Transaction) {
+async function sendCreateVideoChannel (videoChannel: VideoChannelModel, t: Transaction) {
  const byAccount = videoChannel.Account
  const videoChannelObject = videoChannel.toActivityPubObject()
@@ -22,7 +24,7 @@ async function sendCreateVideoChannel (videoChannel: VideoChannelInstance, t: Tr
  return broadcastToFollowers(data, byAccount, [ byAccount ], t)
 }
-async function sendVideoAbuse (byAccount: AccountInstance, videoAbuse: VideoAbuseInstance, video: VideoInstance, t: Transaction) {
+async function sendVideoAbuse (byAccount: AccountModel, videoAbuse: VideoAbuseModel, video: VideoModel, t: Transaction) {
  const url = getVideoAbuseActivityPubUrl(videoAbuse)
  const audience = { to: [ video.VideoChannel.Account.url ], cc: [] }
@@ -31,7 +33,7 @@ async function sendVideoAbuse (byAccount: AccountInstance, videoAbuse: VideoAbus
  return unicastTo(data, byAccount, video.VideoChannel.Account.sharedInboxUrl, t)
 }
-async function sendCreateViewToOrigin (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
+async function sendCreateViewToOrigin (byAccount: AccountModel, video: VideoModel, t: Transaction) {
  const url = getVideoViewActivityPubUrl(byAccount, video)
  const viewActivity = createViewActivityData(byAccount, video)
@@ -42,7 +44,7 @@ async function sendCreateViewToOrigin (byAccount: AccountInstance, video: VideoI
  return unicastTo(data, byAccount, video.VideoChannel.Account.sharedInboxUrl, t)
 }
-async function sendCreateViewToVideoFollowers (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
+async function sendCreateViewToVideoFollowers (byAccount: AccountModel, video: VideoModel, t: Transaction) {
  const url = getVideoViewActivityPubUrl(byAccount, video)
  const viewActivity = createViewActivityData(byAccount, video)
@@ -56,7 +58,7 @@ async function sendCreateViewToVideoFollowers (byAccount: AccountInstance, video
  return broadcastToFollowers(data, serverAccount, accountsToForwardView, t, followersException)
 }
-async function sendCreateDislikeToOrigin (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
+async function sendCreateDislikeToOrigin (byAccount: AccountModel, video: VideoModel, t: Transaction) {
  const url = getVideoDislikeActivityPubUrl(byAccount, video)
  const dislikeActivity = createDislikeActivityData(byAccount, video)
@@ -67,7 +69,7 @@ async function sendCreateDislikeToOrigin (byAccount: AccountInstance, video: Vid
  return unicastTo(data, byAccount, video.VideoChannel.Account.sharedInboxUrl, t)
 }
-async function sendCreateDislikeToVideoFollowers (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
+async function sendCreateDislikeToVideoFollowers (byAccount: AccountModel, video: VideoModel, t: Transaction) {
  const url = getVideoDislikeActivityPubUrl(byAccount, video)
  const dislikeActivity = createDislikeActivityData(byAccount, video)
@@ -79,12 +81,18 @@ async function sendCreateDislikeToVideoFollowers (byAccount: AccountInstance, vi
  return broadcastToFollowers(data, byAccount, accountsToForwardView, t, followersException)
 }
-async function createActivityData (url: string, byAccount: AccountInstance, object: any, t: Transaction, audience?: ActivityAudience) {
+async function createActivityData (
+  url: string,
+  byAccount: AccountModel,
+  object: any,
+  t: Transaction,
+  audience?: ActivityAudience
+): Promise<ActivityCreate> {
  if (!audience) {
    audience = await getAudience(byAccount, t)
  }
-  const activity: ActivityCreate = {
+  return {
    type: 'Create',
    id: url,
    actor: byAccount.url,
@@ -92,18 +100,14 @@ async function createActivityData (url: string, byAccount: AccountInstance, obje
    cc: audience.cc,
    object
  }
-  return activity
 }
-function createDislikeActivityData (byAccount: AccountInstance, video: VideoInstance) {
+function createDislikeActivityData (byAccount: AccountModel, video: VideoModel) {
-  const obj = {
+  return {
    type: 'Dislike',
    actor: byAccount.url,
    object: video.url
  }
-  return obj
 }
 // ---------------------------------------------------------------------------
@@ -121,12 +125,10 @@ export {
 // ---------------------------------------------------------------------------
-function createViewActivityData (byAccount: AccountInstance, video: VideoInstance) {
+function createViewActivityData (byAccount: AccountModel, video: VideoModel) {
-  const obj = {
+  return {
    type: 'View',
    actor: byAccount.url,
    object: video.url
  }
-  return obj
 }
diff --git a/server/lib/activitypub/send/send-delete.ts b/server/lib/activitypub/send/send-delete.ts
index 8193790b3..0a45ea10f 100644
--- a/server/lib/activitypub/send/send-delete.ts
+++ b/server/lib/activitypub/send/send-delete.ts
@@ -1,32 +1,35 @@
 import { Transaction } from 'sequelize'
-import { ActivityDelete } from '../../../../shared/models/activitypub/activity'
+import { ActivityDelete } from '../../../../shared/models/activitypub'
-import { database as db } from '../../../initializers'
+import { AccountModel } from '../../../models/account/account'
-import { AccountInstance, VideoChannelInstance, VideoInstance } from '../../../models'
+import { VideoModel } from '../../../models/video/video'
+import { VideoChannelModel } from '../../../models/video/video-channel'
+import { VideoChannelShareModel } from '../../../models/video/video-channel-share'
+import { VideoShareModel } from '../../../models/video/video-share'
 import { broadcastToFollowers } from './misc'
-async function sendDeleteVideoChannel (videoChannel: VideoChannelInstance, t: Transaction) {
+async function sendDeleteVideoChannel (videoChannel: VideoChannelModel, t: Transaction) {
  const byAccount = videoChannel.Account
  const data = deleteActivityData(videoChannel.url, byAccount)
-  const accountsInvolved = await db.VideoChannelShare.loadAccountsByShare(videoChannel.id, t)
+  const accountsInvolved = await VideoChannelShareModel.loadAccountsByShare(videoChannel.id, t)
  accountsInvolved.push(byAccount)
  return broadcastToFollowers(data, byAccount, accountsInvolved, t)
 }
-async function sendDeleteVideo (video: VideoInstance, t: Transaction) {
+async function sendDeleteVideo (video: VideoModel, t: Transaction) {
  const byAccount = video.VideoChannel.Account
  const data = deleteActivityData(video.url, byAccount)
-  const accountsInvolved = await db.VideoShare.loadAccountsByShare(video.id, t)
+  const accountsInvolved = await VideoShareModel.loadAccountsByShare(video.id, t)
  accountsInvolved.push(byAccount)
  return broadcastToFollowers(data, byAccount, accountsInvolved, t)
 }
-async function sendDeleteAccount (account: AccountInstance, t: Transaction) {
+async function sendDeleteAccount (account: AccountModel, t: Transaction) {
  const data = deleteActivityData(account.url, account)
  return broadcastToFollowers(data, account, [ account ], t)
@@ -42,12 +45,10 @@ export {
 // ---------------------------------------------------------------------------
-function deleteActivityData (url: string, byAccount: AccountInstance) {
+function deleteActivityData (url: string, byAccount: AccountModel): ActivityDelete {
-  const activity: ActivityDelete = {
+  return {
    type: 'Delete',
    id: url,
    actor: byAccount.url
  }
-  return activity
 }
diff --git a/server/lib/activitypub/send/send-follow.ts b/server/lib/activitypub/send/send-follow.ts
index 8fba1b6b5..51735ddfd 100644
--- a/server/lib/activitypub/send/send-follow.ts
+++ b/server/lib/activitypub/send/send-follow.ts
@@ -1,11 +1,11 @@
 import { Transaction } from 'sequelize'
-import { ActivityFollow } from '../../../../shared/models/activitypub/activity'
+import { ActivityFollow } from '../../../../shared/models/activitypub'
-import { AccountInstance } from '../../../models'
+import { AccountModel } from '../../../models/account/account'
-import { AccountFollowInstance } from '../../../models/account/account-follow-interface'
+import { AccountFollowModel } from '../../../models/account/account-follow'
 import { getAccountFollowActivityPubUrl } from '../url'
 import { unicastTo } from './misc'
-function sendFollow (accountFollow: AccountFollowInstance, t: Transaction) {
+function sendFollow (accountFollow: AccountFollowModel, t: Transaction) {
  const me = accountFollow.AccountFollower
  const following = accountFollow.AccountFollowing
@@ -15,15 +15,13 @@ function sendFollow (accountFollow: AccountFollowInstance, t: Transaction) {
  return unicastTo(data, me, following.inboxUrl, t)
 }
-function followActivityData (url: string, byAccount: AccountInstance, targetAccount: AccountInstance) {
+function followActivityData (url: string, byAccount: AccountModel, targetAccount: AccountModel): ActivityFollow {
-  const activity: ActivityFollow = {
+  return {
    type: 'Follow',
    id: url,
    actor: byAccount.url,
    object: targetAccount.url
  }
-  return activity
 }
 // ---------------------------------------------------------------------------
diff --git a/server/lib/activitypub/send/send-like.ts b/server/lib/activitypub/send/send-like.ts
index 0c464b2d3..1a35d0db0 100644
--- a/server/lib/activitypub/send/send-like.ts
+++ b/server/lib/activitypub/send/send-like.ts
@@ -1,6 +1,7 @@
 import { Transaction } from 'sequelize'
-import { ActivityAudience, ActivityLike } from '../../../../shared/models/activitypub/activity'
+import { ActivityAudience, ActivityLike } from '../../../../shared/models/activitypub'
-import { AccountInstance, VideoInstance } from '../../../models'
+import { AccountModel } from '../../../models/account/account'
+import { VideoModel } from '../../../models/video/video'
 import { getVideoLikeActivityPubUrl } from '../url'
 import {
  broadcastToFollowers,
@@ -11,7 +12,7 @@ import {
  unicastTo
 } from './misc'
-async function sendLikeToOrigin (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
+async function sendLikeToOrigin (byAccount: AccountModel, video: VideoModel, t: Transaction) {
  const url = getVideoLikeActivityPubUrl(byAccount, video)
  const accountsInvolvedInVideo = await getAccountsInvolvedInVideo(video, t)
@@ -21,7 +22,7 @@ async function sendLikeToOrigin (byAccount: AccountInstance, video: VideoInstanc
  return unicastTo(data, byAccount, video.VideoChannel.Account.sharedInboxUrl, t)
 }
-async function sendLikeToVideoFollowers (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
+async function sendLikeToVideoFollowers (byAccount: AccountModel, video: VideoModel, t: Transaction) {
  const url = getVideoLikeActivityPubUrl(byAccount, video)
  const accountsInvolvedInVideo = await getAccountsInvolvedInVideo(video, t)
@@ -34,16 +35,16 @@ async function sendLikeToVideoFollowers (byAccount: AccountInstance, video: Vide
 async function likeActivityData (
  url: string,
-  byAccount: AccountInstance,
+  byAccount: AccountModel,
-  video: VideoInstance,
+  video: VideoModel,
  t: Transaction,
  audience?: ActivityAudience
-) {
+): Promise<ActivityLike> {
  if (!audience) {
    audience = await getAudience(byAccount, t)
  }
-  const activity: ActivityLike = {
+  return {
    type: 'Like',
    id: url,
    actor: byAccount.url,
@@ -51,8 +52,6 @@ async function likeActivityData (
    cc: audience.cc,
    object: video.url
  }
-  return activity
 }
 // ---------------------------------------------------------------------------
diff --git a/server/lib/activitypub/send/send-undo.ts b/server/lib/activitypub/send/send-undo.ts
index 015f02b35..699f920f0 100644
--- a/server/lib/activitypub/send/send-undo.ts
+++ b/server/lib/activitypub/send/send-undo.ts
@@ -5,10 +5,10 @@ import {
  ActivityFollow,
  ActivityLike,
  ActivityUndo
-} from '../../../../shared/models/activitypub/activity'
+} from '../../../../shared/models/activitypub'
-import { AccountInstance } from '../../../models'
+import { AccountModel } from '../../../models/account/account'
-import { AccountFollowInstance } from '../../../models/account/account-follow-interface'
+import { AccountFollowModel } from '../../../models/account/account-follow'
-import { VideoInstance } from '../../../models/video/video-interface'
+import { VideoModel } from '../../../models/video/video'
 import { getAccountFollowActivityPubUrl, getUndoActivityPubUrl, getVideoDislikeActivityPubUrl, getVideoLikeActivityPubUrl } from '../url'
 import {
  broadcastToFollowers,
@@ -22,7 +22,7 @@ import { createActivityData, createDislikeActivityData } from './send-create'
 import { followActivityData } from './send-follow'
 import { likeActivityData } from './send-like'
-async function sendUndoFollow (accountFollow: AccountFollowInstance, t: Transaction) {
+async function sendUndoFollow (accountFollow: AccountFollowModel, t: Transaction) {
  const me = accountFollow.AccountFollower
  const following = accountFollow.AccountFollowing
@@ -35,7 +35,7 @@ async function sendUndoFollow (accountFollow: AccountFollowInstance, t: Transact
  return unicastTo(data, me, following.inboxUrl, t)
 }
-async function sendUndoLikeToOrigin (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
+async function sendUndoLikeToOrigin (byAccount: AccountModel, video: VideoModel, t: Transaction) {
  const likeUrl = getVideoLikeActivityPubUrl(byAccount, video)
  const undoUrl = getUndoActivityPubUrl(likeUrl)
@@ -47,7 +47,7 @@ async function sendUndoLikeToOrigin (byAccount: AccountInstance, video: VideoIns
  return unicastTo(data, byAccount, video.VideoChannel.Account.sharedInboxUrl, t)
 }
-async function sendUndoLikeToVideoFollowers (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
+async function sendUndoLikeToVideoFollowers (byAccount: AccountModel, video: VideoModel, t: Transaction) {
  const likeUrl = getVideoLikeActivityPubUrl(byAccount, video)
  const undoUrl = getUndoActivityPubUrl(likeUrl)
@@ -60,7 +60,7 @@ async function sendUndoLikeToVideoFollowers (byAccount: AccountInstance, video:
  return broadcastToFollowers(data, byAccount, toAccountsFollowers, t, followersException)
 }
-async function sendUndoDislikeToOrigin (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
+async function sendUndoDislikeToOrigin (byAccount: AccountModel, video: VideoModel, t: Transaction) {
  const dislikeUrl = getVideoDislikeActivityPubUrl(byAccount, video)
  const undoUrl = getUndoActivityPubUrl(dislikeUrl)
@@ -74,7 +74,7 @@ async function sendUndoDislikeToOrigin (byAccount: AccountInstance, video: Video
  return unicastTo(data, byAccount, video.VideoChannel.Account.sharedInboxUrl, t)
 }
-async function sendUndoDislikeToVideoFollowers (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
+async function sendUndoDislikeToVideoFollowers (byAccount: AccountModel, video: VideoModel, t: Transaction) {
  const dislikeUrl = getVideoDislikeActivityPubUrl(byAccount, video)
  const undoUrl = getUndoActivityPubUrl(dislikeUrl)
@@ -103,16 +103,16 @@ export {
 async function undoActivityData (
  url: string,
-  byAccount: AccountInstance,
+  byAccount: AccountModel,
  object: ActivityFollow | ActivityLike | ActivityCreate,
  t: Transaction,
  audience?: ActivityAudience
-) {
+): Promise<ActivityUndo> {
  if (!audience) {
    audience = await getAudience(byAccount, t)
  }
-  const activity: ActivityUndo = {
+  return {
    type: 'Undo',
    id: url,
    actor: byAccount.url,
@@ -120,6 +120,4 @@ async function undoActivityData (
    cc: audience.cc,
    object
  }
-  return activity
 }
diff --git a/server/lib/activitypub/send/send-update.ts b/server/lib/activitypub/send/send-update.ts
index 59524e523..9baf13a87 100644
--- a/server/lib/activitypub/send/send-update.ts
+++ b/server/lib/activitypub/send/send-update.ts
@@ -1,31 +1,34 @@
 import { Transaction } from 'sequelize'
-import { ActivityUpdate } from '../../../../shared/models/activitypub/activity'
+import { ActivityUpdate } from '../../../../shared/models/activitypub'
-import { database as db } from '../../../initializers'
+import { AccountModel } from '../../../models/account/account'
-import { AccountInstance, VideoChannelInstance, VideoInstance } from '../../../models'
+import { VideoModel } from '../../../models/video/video'
+import { VideoChannelModel } from '../../../models/video/video-channel'
+import { VideoChannelShareModel } from '../../../models/video/video-channel-share'
+import { VideoShareModel } from '../../../models/video/video-share'
 import { getUpdateActivityPubUrl } from '../url'
 import { broadcastToFollowers, getAudience } from './misc'
-async function sendUpdateVideoChannel (videoChannel: VideoChannelInstance, t: Transaction) {
+async function sendUpdateVideoChannel (videoChannel: VideoChannelModel, t: Transaction) {
  const byAccount = videoChannel.Account
  const url = getUpdateActivityPubUrl(videoChannel.url, videoChannel.updatedAt.toISOString())
  const videoChannelObject = videoChannel.toActivityPubObject()
  const data = await updateActivityData(url, byAccount, videoChannelObject, t)
-  const accountsInvolved = await db.VideoChannelShare.loadAccountsByShare(videoChannel.id, t)
+  const accountsInvolved = await VideoChannelShareModel.loadAccountsByShare(videoChannel.id, t)
  accountsInvolved.push(byAccount)
  return broadcastToFollowers(data, byAccount, accountsInvolved, t)
 }
-async function sendUpdateVideo (video: VideoInstance, t: Transaction) {
+async function sendUpdateVideo (video: VideoModel, t: Transaction) {
  const byAccount = video.VideoChannel.Account
  const url = getUpdateActivityPubUrl(video.url, video.updatedAt.toISOString())
  const videoObject = video.toActivityPubObject()
  const data = await updateActivityData(url, byAccount, videoObject, t)
-  const accountsInvolved = await db.VideoShare.loadAccountsByShare(video.id, t)
+  const accountsInvolved = await VideoShareModel.loadAccountsByShare(video.id, t)
  accountsInvolved.push(byAccount)
  return broadcastToFollowers(data, byAccount, accountsInvolved, t)
@@ -40,9 +43,9 @@ export {
 // ---------------------------------------------------------------------------
-async function updateActivityData (url: string, byAccount: AccountInstance, object: any, t: Transaction) {
+async function updateActivityData (url: string, byAccount: AccountModel, object: any, t: Transaction): Promise<ActivityUpdate> {
  const { to, cc } = await getAudience(byAccount, t)
-  const activity: ActivityUpdate = {
+  return {
    type: 'Update',
    id: url,
    actor: byAccount.url,
@@ -50,6 +53,4 @@ async function updateActivityData (url: string, byAccount: AccountInstance, obje
    cc,
    object
  }
-  return activity
 }
diff --git a/server/lib/activitypub/share.ts b/server/lib/activitypub/share.ts
index e14b0f50c..5bec61c05 100644
--- a/server/lib/activitypub/share.ts
+++ b/server/lib/activitypub/share.ts
@@ -1,14 +1,15 @@
 import { Transaction } from 'sequelize'
-import { getServerAccount } from '../../helpers/utils'
+import { getServerAccount } from '../../helpers'
-import { database as db } from '../../initializers'
+import { VideoModel } from '../../models/video/video'
-import { VideoChannelInstance } from '../../models/index'
+import { VideoChannelModel } from '../../models/video/video-channel'
-import { VideoInstance } from '../../models/video/video-interface'
+import { VideoChannelShareModel } from '../../models/video/video-channel-share'
-import { sendVideoAnnounceToFollowers, sendVideoChannelAnnounceToFollowers } from './send/send-announce'
+import { VideoShareModel } from '../../models/video/video-share'
+import { sendVideoAnnounceToFollowers, sendVideoChannelAnnounceToFollowers } from './send'
-async function shareVideoChannelByServer (videoChannel: VideoChannelInstance, t: Transaction) {
+async function shareVideoChannelByServer (videoChannel: VideoChannelModel, t: Transaction) {
  const serverAccount = await getServerAccount()
-  await db.VideoChannelShare.create({
+  await VideoChannelShareModel.create({
    accountId: serverAccount.id,
    videoChannelId: videoChannel.id
  }, { transaction: t })
@@ -16,10 +17,10 @@ async function shareVideoChannelByServer (videoChannel: VideoChannelInstance, t:
  return sendVideoChannelAnnounceToFollowers(serverAccount, videoChannel, t)
 }
-async function shareVideoByServer (video: VideoInstance, t: Transaction) {
+async function shareVideoByServer (video: VideoModel, t: Transaction) {
  const serverAccount = await getServerAccount()
-  await db.VideoShare.create({
+  await VideoShareModel.create({
    accountId: serverAccount.id,
    videoId: video.id
  }, { transaction: t })
diff --git a/server/lib/activitypub/url.ts b/server/lib/activitypub/url.ts
index 6475c4218..00b4e8852 100644
--- a/server/lib/activitypub/url.ts
+++ b/server/lib/activitypub/url.ts
@@ -1,15 +1,15 @@
-import { CONFIG } from '../../initializers/constants'
+import { CONFIG } from '../../initializers'
-import { VideoInstance } from '../../models/video/video-interface'
+import { AccountModel } from '../../models/account/account'
-import { VideoChannelInstance } from '../../models/video/video-channel-interface'
+import { AccountFollowModel } from '../../models/account/account-follow'
-import { VideoAbuseInstance } from '../../models/video/video-abuse-interface'
+import { VideoModel } from '../../models/video/video'
-import { AccountFollowInstance } from '../../models/account/account-follow-interface'
+import { VideoAbuseModel } from '../../models/video/video-abuse'
-import { AccountInstance } from '../../models/account/account-interface'
+import { VideoChannelModel } from '../../models/video/video-channel'
-function getVideoActivityPubUrl (video: VideoInstance) {
+function getVideoActivityPubUrl (video: VideoModel) {
  return CONFIG.WEBSERVER.URL + '/videos/watch/' + video.uuid
 }
-function getVideoChannelActivityPubUrl (videoChannel: VideoChannelInstance) {
+function getVideoChannelActivityPubUrl (videoChannel: VideoChannelModel) {
  return CONFIG.WEBSERVER.URL + '/video-channels/' + videoChannel.uuid
 }
@@ -17,37 +17,37 @@ function getAccountActivityPubUrl (accountName: string) {
  return CONFIG.WEBSERVER.URL + '/account/' + accountName
 }
-function getVideoAbuseActivityPubUrl (videoAbuse: VideoAbuseInstance) {
+function getVideoAbuseActivityPubUrl (videoAbuse: VideoAbuseModel) {
  return CONFIG.WEBSERVER.URL + '/admin/video-abuses/' + videoAbuse.id
 }
-function getVideoViewActivityPubUrl (byAccount: AccountInstance, video: VideoInstance) {
+function getVideoViewActivityPubUrl (byAccount: AccountModel, video: VideoModel) {
  return video.url + '/views/' + byAccount.uuid + '/' + new Date().toISOString()
 }
-function getVideoLikeActivityPubUrl (byAccount: AccountInstance, video: VideoInstance) {
+function getVideoLikeActivityPubUrl (byAccount: AccountModel, video: VideoModel) {
  return byAccount.url + '/likes/' + video.id
 }
-function getVideoDislikeActivityPubUrl (byAccount: AccountInstance, video: VideoInstance) {
+function getVideoDislikeActivityPubUrl (byAccount: AccountModel, video: VideoModel) {
  return byAccount.url + '/dislikes/' + video.id
 }
-function getAccountFollowActivityPubUrl (accountFollow: AccountFollowInstance) {
+function getAccountFollowActivityPubUrl (accountFollow: AccountFollowModel) {
  const me = accountFollow.AccountFollower
  const following = accountFollow.AccountFollowing
  return me.url + '/follows/' + following.id
 }
-function getAccountFollowAcceptActivityPubUrl (accountFollow: AccountFollowInstance) {
+function getAccountFollowAcceptActivityPubUrl (accountFollow: AccountFollowModel) {
  const follower = accountFollow.AccountFollower
  const me = accountFollow.AccountFollowing
  return follower.url + '/accepts/follows/' + me.id
 }
-function getAnnounceActivityPubUrl (originalUrl: string, byAccount: AccountInstance) {
+function getAnnounceActivityPubUrl (originalUrl: string, byAccount: AccountModel) {
  return originalUrl + '/announces/' + byAccount.id
 }
diff --git a/server/lib/activitypub/video-channels.ts b/server/lib/activitypub/video-channels.ts
index 7339d79f9..c05a46f95 100644
--- a/server/lib/activitypub/video-channels.ts
+++ b/server/lib/activitypub/video-channels.ts
@@ -1,14 +1,13 @@
-import { VideoChannelObject } from '../../../shared/models/activitypub/objects/video-channel-object'
+import { VideoChannelObject } from '../../../shared/models/activitypub/objects'
-import { isVideoChannelObjectValid } from '../../helpers/custom-validators/activitypub/video-channels'
+import { doRequest, logger } from '../../helpers'
-import { logger } from '../../helpers/logger'
+import { isVideoChannelObjectValid } from '../../helpers/custom-validators/activitypub'
-import { doRequest } from '../../helpers/requests'
+import { ACTIVITY_PUB } from '../../initializers'
-import { database as db } from '../../initializers'
+import { AccountModel } from '../../models/account/account'
-import { ACTIVITY_PUB } from '../../initializers/constants'
+import { VideoChannelModel } from '../../models/video/video-channel'
-import { AccountInstance } from '../../models/account/account-interface'
 import { videoChannelActivityObjectToDBAttributes } from './process/misc'
-async function getOrCreateVideoChannel (ownerAccount: AccountInstance, videoChannelUrl: string) {
+async function getOrCreateVideoChannel (ownerAccount: AccountModel, videoChannelUrl: string) {
-  let videoChannel = await db.VideoChannel.loadByUrl(videoChannelUrl)
+  let videoChannel = await VideoChannelModel.loadByUrl(videoChannelUrl)
  // We don't have this account in our database, fetch it on remote
  if (!videoChannel) {
@@ -22,7 +21,7 @@ async function getOrCreateVideoChannel (ownerAccount: AccountInstance, videoChan
  return videoChannel
 }
-async function fetchRemoteVideoChannel (ownerAccount: AccountInstance, videoChannelUrl: string) {
+async function fetchRemoteVideoChannel (ownerAccount: AccountModel, videoChannelUrl: string) {
  const options = {
    uri: videoChannelUrl,
    method: 'GET',
@@ -48,7 +47,7 @@ async function fetchRemoteVideoChannel (ownerAccount: AccountInstance, videoChan
  }
  const videoChannelAttributes = videoChannelActivityObjectToDBAttributes(videoChannelJSON, ownerAccount)
-  const videoChannel = db.VideoChannel.build(videoChannelAttributes)
+  const videoChannel = new VideoChannelModel(videoChannelAttributes)
  videoChannel.Account = ownerAccount
  return videoChannel
diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts
index 6b82f12d5..14c07fec0 100644
--- a/server/lib/activitypub/videos.ts
+++ b/server/lib/activitypub/videos.ts
@@ -2,21 +2,22 @@ import { join } from 'path'
 import * as request from 'request'
 import { Transaction } from 'sequelize'
 import { ActivityIconObject } from '../../../shared/index'
-import { doRequest, doRequestAndSaveToFile } from '../../helpers/requests'
+import { doRequest, doRequestAndSaveToFile } from '../../helpers'
-import { CONFIG, REMOTE_SCHEME, STATIC_PATHS } from '../../initializers/constants'
+import { CONFIG, REMOTE_SCHEME, STATIC_PATHS } from '../../initializers'
-import { AccountInstance } from '../../models/account/account-interface'
+import { AccountModel } from '../../models/account/account'
-import { VideoInstance } from '../../models/video/video-interface'
+import { VideoModel } from '../../models/video/video'
-import { sendLikeToOrigin } from './index'
-import { sendCreateDislikeToOrigin, sendCreateDislikeToVideoFollowers } from './send/send-create'
-import { sendLikeToVideoFollowers } from './send/send-like'
 import {
+  sendCreateDislikeToOrigin,
+  sendCreateDislikeToVideoFollowers,
+  sendLikeToOrigin,
+  sendLikeToVideoFollowers,
  sendUndoDislikeToOrigin,
  sendUndoDislikeToVideoFollowers,
  sendUndoLikeToOrigin,
  sendUndoLikeToVideoFollowers
-} from './send/send-undo'
+} from './send'
-function fetchRemoteVideoPreview (video: VideoInstance) {
+function fetchRemoteVideoPreview (video: VideoModel) {
  // FIXME: use url
  const host = video.VideoChannel.Account.Server.host
  const path = join(STATIC_PATHS.PREVIEWS, video.getPreviewName())
@@ -24,7 +25,7 @@ function fetchRemoteVideoPreview (video: VideoInstance) {
  return request.get(REMOTE_SCHEME.HTTP + '://' + host + path)
 }
-async function fetchRemoteVideoDescription (video: VideoInstance) {
+async function fetchRemoteVideoDescription (video: VideoModel) {
  // FIXME: use url
  const host = video.VideoChannel.Account.Server.host
  const path = video.getDescriptionPath()
@@ -37,7 +38,7 @@ async function fetchRemoteVideoDescription (video: VideoInstance) {
  return body.description ? body.description : ''
 }
-function generateThumbnailFromUrl (video: VideoInstance, icon: ActivityIconObject) {
+function generateThumbnailFromUrl (video: VideoModel, icon: ActivityIconObject) {
  const thumbnailName = video.getThumbnailName()
  const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, thumbnailName)
@@ -49,8 +50,8 @@ function generateThumbnailFromUrl (video: VideoInstance, icon: ActivityIconObjec
 }
 async function sendVideoRateChangeToFollowers (
-  account: AccountInstance,
+    account: AccountModel,
-  video: VideoInstance,
+  video: VideoModel,
  likes: number,
  dislikes: number,
  t: Transaction
@@ -69,8 +70,8 @@ async function sendVideoRateChangeToFollowers (
 }
 async function sendVideoRateChangeToOrigin (
-  account: AccountInstance,
+    account: AccountModel,
-  video: VideoInstance,
+  video: VideoModel,
  likes: number,
  dislikes: number,
  t: Transaction
diff --git a/server/lib/cache/videos-preview-cache.ts b/server/lib/cache/videos-preview-cache.ts
index 7f352f361..c5bda8dd8 100644
--- a/server/lib/cache/videos-preview-cache.ts
+++ b/server/lib/cache/videos-preview-cache.ts
@@ -1,11 +1,10 @@
 import * as asyncLRU from 'async-lru'
-import { join } from 'path'
 import { createWriteStream } from 'fs'
+import { join } from 'path'
-import { database as db, CONFIG, CACHE } from '../../initializers'
 import { logger, unlinkPromise } from '../../helpers'
-import { VideoInstance } from '../../models'
+import { CACHE, CONFIG } from '../../initializers'
-import { fetchRemoteVideoPreview } from '../activitypub/videos'
+import { VideoModel } from '../../models/video/video'
+import { fetchRemoteVideoPreview } from '../activitypub'
 class VideosPreviewCache {
@@ -43,7 +42,7 @@ class VideosPreviewCache {
  }
  private async loadPreviews (key: string) {
-    const video = await db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(key)
+    const video = await VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(key)
    if (!video) return undefined
    if (video.isOwned()) return join(CONFIG.STORAGE.PREVIEWS_DIR, video.getPreviewName())
@@ -53,7 +52,7 @@ class VideosPreviewCache {
    return res
  }
-  private saveRemotePreviewAndReturnPath (video: VideoInstance) {
+  private saveRemotePreviewAndReturnPath (video: VideoModel) {
    const req = fetchRemoteVideoPreview(video)
    return new Promise<string>((res, rej) => {
diff --git a/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-broadcast-handler.ts b/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-broadcast-handler.ts
index 49d4bf5c6..8040dde2a 100644
--- a/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-broadcast-handler.ts
+++ b/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-broadcast-handler.ts
@@ -1,5 +1,4 @@
-import { logger } from '../../../helpers'
+import { doRequest, logger } from '../../../helpers'
-import { doRequest } from '../../../helpers/requests'
 import { ActivityPubHttpPayload, computeBody, maybeRetryRequestLater } from './activitypub-http-job-scheduler'
 async function process (payload: ActivityPubHttpPayload, jobId: number) {
diff --git a/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-fetcher-handler.ts b/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-fetcher-handler.ts
index 9adceab84..638150202 100644
--- a/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-fetcher-handler.ts
+++ b/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-fetcher-handler.ts
@@ -1,7 +1,6 @@
-import { logger } from '../../../helpers'
+import { doRequest, logger } from '../../../helpers'
-import { doRequest } from '../../../helpers/requests'
+import { ACTIVITY_PUB } from '../../../initializers'
-import { ACTIVITY_PUB } from '../../../initializers/constants'
+import { processActivities } from '../../activitypub/process'
-import { processActivities } from '../../activitypub/process/process'
 import { ActivityPubHttpPayload } from './activitypub-http-job-scheduler'
 async function process (payload: ActivityPubHttpPayload, jobId: number) {
diff --git a/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-job-scheduler.ts b/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-job-scheduler.ts
index fcc81eb16..76da5b724 100644
--- a/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-job-scheduler.ts
+++ b/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-job-scheduler.ts
@@ -1,8 +1,7 @@
 import { JobCategory } from '../../../../shared'
-import { buildSignedActivity } from '../../../helpers/activitypub'
+import { buildSignedActivity, logger } from '../../../helpers'
-import { logger } from '../../../helpers/logger'
+import { ACTIVITY_PUB } from '../../../initializers'
-import { ACTIVITY_PUB } from '../../../initializers/constants'
+import { AccountModel } from '../../../models/account/account'
-import { database as db } from '../../../initializers/database'
 import { JobHandler, JobScheduler } from '../job-scheduler'
 import * as activitypubHttpBroadcastHandler from './activitypub-http-broadcast-handler'
@@ -46,7 +45,7 @@ async function computeBody (payload: ActivityPubHttpPayload) {
  let body = payload.body
  if (payload.signatureAccountId) {
-    const accountSignature = await db.Account.load(payload.signatureAccountId)
+    const accountSignature = await AccountModel.load(payload.signatureAccountId)
    if (!accountSignature) throw new Error('Unknown signature account id.')
    body = await buildSignedActivity(accountSignature, payload.body)
  }
diff --git a/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-unicast-handler.ts b/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-unicast-handler.ts
index 4c95197c4..f16cfcec3 100644
--- a/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-unicast-handler.ts
+++ b/server/lib/jobs/activitypub-http-job-scheduler/activitypub-http-unicast-handler.ts
@@ -1,5 +1,4 @@
-import { logger } from '../../../helpers'
+import { doRequest, logger } from '../../../helpers'
-import { doRequest } from '../../../helpers/requests'
 import { ActivityPubHttpPayload, computeBody, maybeRetryRequestLater } from './activitypub-http-job-scheduler'
 async function process (payload: ActivityPubHttpPayload, jobId: number) {
diff --git a/server/lib/jobs/job-scheduler.ts b/server/lib/jobs/job-scheduler.ts
index 62ce6927e..88fe8a4a3 100644
--- a/server/lib/jobs/job-scheduler.ts
+++ b/server/lib/jobs/job-scheduler.ts
@@ -2,8 +2,8 @@ import { AsyncQueue, forever, queue } from 'async'
 import * as Sequelize from 'sequelize'
 import { JobCategory } from '../../../shared'
 import { logger } from '../../helpers'
-import { database as db, JOB_STATES, JOBS_FETCH_LIMIT_PER_CYCLE, JOBS_FETCHING_INTERVAL } from '../../initializers'
+import { JOB_STATES, JOBS_FETCH_LIMIT_PER_CYCLE, JOBS_FETCHING_INTERVAL } from '../../initializers'
-import { JobInstance } from '../../models'
+import { JobModel } from '../../models/job/job'
 export interface JobHandler<P, T> {
  process (data: object, jobId: number): Promise<T>
@@ -24,12 +24,12 @@ class JobScheduler<P, T> {
    logger.info('Jobs scheduler %s activated.', this.jobCategory)
-    const jobsQueue = queue<JobInstance, JobQueueCallback>(this.processJob.bind(this))
+    const jobsQueue = queue<JobModel, JobQueueCallback>(this.processJob.bind(this))
    // Finish processing jobs from a previous start
    const state = JOB_STATES.PROCESSING
    try {
-      const jobs = await db.Job.listWithLimitByCategory(limit, state, this.jobCategory)
+      const jobs = await JobModel.listWithLimitByCategory(limit, state, this.jobCategory)
      this.enqueueJobs(jobsQueue, jobs)
    } catch (err) {
@@ -45,7 +45,7 @@ class JobScheduler<P, T> {
        const state = JOB_STATES.PENDING
        try {
-          const jobs = await db.Job.listWithLimitByCategory(limit, state, this.jobCategory)
+          const jobs = await JobModel.listWithLimitByCategory(limit, state, this.jobCategory)
          this.enqueueJobs(jobsQueue, jobs)
        } catch (err) {
@@ -70,14 +70,14 @@ class JobScheduler<P, T> {
    const options = { transaction }
-    return db.Job.create(createQuery, options)
+    return JobModel.create(createQuery, options)
  }
-  private enqueueJobs (jobsQueue: AsyncQueue<JobInstance>, jobs: JobInstance[]) {
+  private enqueueJobs (jobsQueue: AsyncQueue<JobModel>, jobs: JobModel[]) {
    jobs.forEach(job => jobsQueue.push(job))
  }
-  private async processJob (job: JobInstance, callback: (err: Error) => void) {
+  private async processJob (job: JobModel, callback: (err: Error) => void) {
    const jobHandler = this.jobHandlers[job.handlerName]
    if (jobHandler === undefined) {
      const errorString = 'Unknown job handler ' + job.handlerName + ' for job ' + job.id
@@ -110,7 +110,7 @@ class JobScheduler<P, T> {
    return callback(null)
  }
-  private async onJobError (jobHandler: JobHandler<P, T>, job: JobInstance, err: Error) {
+  private async onJobError (jobHandler: JobHandler<P, T>, job: JobModel, err: Error) {
    job.state = JOB_STATES.ERROR
    try {
@@ -121,7 +121,7 @@ class JobScheduler<P, T> {
    }
  }
-  private async onJobSuccess (jobHandler: JobHandler<P, T>, job: JobInstance, jobResult: T) {
+  private async onJobSuccess (jobHandler: JobHandler<P, T>, job: JobModel, jobResult: T) {
    job.state = JOB_STATES.SUCCESS
    try {
diff --git a/server/lib/jobs/transcoding-job-scheduler/transcoding-job-scheduler.ts b/server/lib/jobs/transcoding-job-scheduler/transcoding-job-scheduler.ts
index c5efe8eeb..e5530a73c 100644
--- a/server/lib/jobs/transcoding-job-scheduler/transcoding-job-scheduler.ts
+++ b/server/lib/jobs/transcoding-job-scheduler/transcoding-job-scheduler.ts
@@ -1,14 +1,15 @@
 import { JobCategory } from '../../../../shared'
+import { VideoModel } from '../../../models/video/video'
 import { JobHandler, JobScheduler } from '../job-scheduler'
 import * as videoFileOptimizer from './video-file-optimizer-handler'
 import * as videoFileTranscoder from './video-file-transcoder-handler'
-import { VideoInstance } from '../../../models/video/video-interface'
 type TranscodingJobPayload = {
  videoUUID: string
  resolution?: number
 }
-const jobHandlers: { [ handlerName: string ]: JobHandler<TranscodingJobPayload, VideoInstance> } = {
+const jobHandlers: { [ handlerName: string ]: JobHandler<TranscodingJobPayload, VideoModel> } = {
  videoFileOptimizer,
  videoFileTranscoder
 }
diff --git a/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts b/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts
index e65ab3ee1..1786ce971 100644
--- a/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts
+++ b/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts
@@ -1,14 +1,14 @@
 import * as Bluebird from 'bluebird'
 import { computeResolutionsToTranscode, logger } from '../../../helpers'
-import { database as db } from '../../../initializers/database'
+import { sequelizeTypescript } from '../../../initializers'
-import { VideoInstance } from '../../../models'
+import { VideoModel } from '../../../models/video/video'
-import { sendAddVideo } from '../../activitypub/send/send-add'
+import { shareVideoByServer } from '../../activitypub'
+import { sendAddVideo } from '../../activitypub/send'
 import { JobScheduler } from '../job-scheduler'
 import { TranscodingJobPayload } from './transcoding-job-scheduler'
-import { shareVideoByServer } from '../../activitypub/share'
 async function process (data: TranscodingJobPayload, jobId: number) {
-  const video = await db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(data.videoUUID)
+  const video = await VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(data.videoUUID)
  // No video, maybe deleted?
  if (!video) {
    logger.info('Do not process job %d, video does not exist.', jobId, { videoUUID: video.uuid })
@@ -25,13 +25,13 @@ function onError (err: Error, jobId: number) {
  return Promise.resolve()
 }
-async function onSuccess (jobId: number, video: VideoInstance, jobScheduler: JobScheduler<TranscodingJobPayload, VideoInstance>) {
+async function onSuccess (jobId: number, video: VideoModel, jobScheduler: JobScheduler<TranscodingJobPayload, VideoModel>) {
  if (video === undefined) return undefined
  logger.info('Job %d is a success.', jobId)
  // Maybe the video changed in database, refresh it
-  const videoDatabase = await db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(video.uuid)
+  const videoDatabase = await VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(video.uuid)
  // Video does not exist anymore
  if (!videoDatabase) return undefined
@@ -50,7 +50,7 @@ async function onSuccess (jobId: number, video: VideoInstance, jobScheduler: Job
  if (resolutionsEnabled.length !== 0) {
    try {
-      await db.sequelize.transaction(async t => {
+      await sequelizeTypescript.transaction(async t => {
        const tasks: Bluebird<any>[] = []
        for (const resolution of resolutionsEnabled) {
diff --git a/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts b/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts
index 867580200..8957b4565 100644
--- a/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts
+++ b/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts
@@ -1,11 +1,10 @@
 import { VideoResolution } from '../../../../shared'
 import { logger } from '../../../helpers'
-import { database as db } from '../../../initializers/database'
+import { VideoModel } from '../../../models/video/video'
-import { VideoInstance } from '../../../models'
+import { sendUpdateVideo } from '../../activitypub/send'
-import { sendUpdateVideo } from '../../activitypub/send/send-update'
 async function process (data: { videoUUID: string, resolution: VideoResolution }, jobId: number) {
-  const video = await db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(data.videoUUID)
+  const video = await VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(data.videoUUID)
  // No video, maybe deleted?
  if (!video) {
    logger.info('Do not process job %d, video does not exist.', jobId, { videoUUID: video.uuid })
@@ -22,13 +21,13 @@ function onError (err: Error, jobId: number) {
  return Promise.resolve()
 }
-async function onSuccess (jobId: number, video: VideoInstance) {
+async function onSuccess (jobId: number, video: VideoModel) {
  if (video === undefined) return undefined
  logger.info('Job %d is a success.', jobId)
  // Maybe the video changed in database, refresh it
-  const videoDatabase = await db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(video.uuid)
+  const videoDatabase = await VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(video.uuid)
  // Video does not exist anymore
  if (!videoDatabase) return undefined
diff --git a/server/lib/oauth-model.ts b/server/lib/oauth-model.ts
index d91b00c55..dce71e83b 100644
--- a/server/lib/oauth-model.ts
+++ b/server/lib/oauth-model.ts
@@ -1,6 +1,7 @@
-import { OAuthClientInstance, UserInstance } from '../models'
-import { database as db } from '../initializers/database'
 import { logger } from '../helpers'
+import { UserModel } from '../models/account/user'
+import { OAuthClientModel } from '../models/oauth/oauth-client'
+import { OAuthTokenModel } from '../models/oauth/oauth-token'
 type TokenInfo = { accessToken: string, refreshToken: string, accessTokenExpiresAt: Date, refreshTokenExpiresAt: Date }
@@ -9,25 +10,25 @@ type TokenInfo = { accessToken: string, refreshToken: string, accessTokenExpires
 function getAccessToken (bearerToken: string) {
  logger.debug('Getting access token (bearerToken: ' + bearerToken + ').')
-  return db.OAuthToken.getByTokenAndPopulateUser(bearerToken)
+  return OAuthTokenModel.getByTokenAndPopulateUser(bearerToken)
 }
 function getClient (clientId: string, clientSecret: string) {
  logger.debug('Getting Client (clientId: ' + clientId + ', clientSecret: ' + clientSecret + ').')
-  return db.OAuthClient.getByIdAndSecret(clientId, clientSecret)
+  return OAuthClientModel.getByIdAndSecret(clientId, clientSecret)
 }
 function getRefreshToken (refreshToken: string) {
  logger.debug('Getting RefreshToken (refreshToken: ' + refreshToken + ').')
-  return db.OAuthToken.getByRefreshTokenAndPopulateClient(refreshToken)
+  return OAuthTokenModel.getByRefreshTokenAndPopulateClient(refreshToken)
 }
 async function getUser (username: string, password: string) {
  logger.debug('Getting User (username: ' + username + ', password: ******).')
-  const user = await db.User.getByUsername(username)
+  const user = await UserModel.getByUsername(username)
  if (!user) return null
  const passwordMatch = await user.isPasswordMatch(password)
@@ -37,7 +38,7 @@ async function getUser (username: string, password: string) {
 }
 async function revokeToken (tokenInfo: TokenInfo) {
-  const token = await db.OAuthToken.getByRefreshTokenAndPopulateUser(tokenInfo.refreshToken)
+  const token = await OAuthTokenModel.getByRefreshTokenAndPopulateUser(tokenInfo.refreshToken)
  if (token) token.destroy()
  /*
@@ -53,7 +54,7 @@ async function revokeToken (tokenInfo: TokenInfo) {
  return expiredToken
 }
-async function saveToken (token: TokenInfo, client: OAuthClientInstance, user: UserInstance) {
+async function saveToken (token: TokenInfo, client: OAuthClientModel, user: UserModel) {
  logger.debug('Saving token ' + token.accessToken + ' for client ' + client.id + ' and user ' + user.id + '.')
  const tokenToCreate = {
@@ -65,7 +66,7 @@ async function saveToken (token: TokenInfo, client: OAuthClientInstance, user: U
    userId: user.id
  }
-  const tokenCreated = await db.OAuthToken.create(tokenToCreate)
+  const tokenCreated = await OAuthTokenModel.create(tokenToCreate)
  const tokenToReturn = Object.assign(tokenCreated, { client, user })
  return tokenToReturn
diff --git a/server/lib/user.ts b/server/lib/user.ts
index 5653d8e65..c4722fae2 100644
--- a/server/lib/user.ts
+++ b/server/lib/user.ts
@@ -1,14 +1,13 @@
 import * as Sequelize from 'sequelize'
-import { createPrivateAndPublicKeys } from '../helpers/peertube-crypto'
+import { createPrivateAndPublicKeys, logger } from '../helpers'
-import { database as db } from '../initializers'
+import { CONFIG, sequelizeTypescript } from '../initializers'
-import { CONFIG } from '../initializers/constants'
+import { AccountModel } from '../models/account/account'
-import { UserInstance } from '../models'
+import { UserModel } from '../models/account/user'
+import { getAccountActivityPubUrl } from './activitypub'
 import { createVideoChannel } from './video-channel'
-import { logger } from '../helpers/logger'
-import { getAccountActivityPubUrl } from './activitypub/url'
-async function createUserAccountAndChannel (user: UserInstance, validateUser = true) {
+async function createUserAccountAndChannel (user: UserModel, validateUser = true) {
-  const { account, videoChannel } = await db.sequelize.transaction(async t => {
+  const { account, videoChannel } = await sequelizeTypescript.transaction(async t => {
    const userOptions = {
      transaction: t,
      validate: validateUser
@@ -38,7 +37,7 @@ async function createUserAccountAndChannel (user: UserInstance, validateUser = t
 async function createLocalAccountWithoutKeys (name: string, userId: number, applicationId: number, t: Sequelize.Transaction) {
  const url = getAccountActivityPubUrl(name)
-  const accountInstance = db.Account.build({
+  const accountInstance = new AccountModel({
    name,
    url,
    publicKey: null,
diff --git a/server/lib/video-channel.ts b/server/lib/video-channel.ts
index beb01da9b..97924aa9e 100644
--- a/server/lib/video-channel.ts
+++ b/server/lib/video-channel.ts
@@ -1,10 +1,10 @@
 import * as Sequelize from 'sequelize'
 import { VideoChannelCreate } from '../../shared/models'
-import { database as db } from '../initializers'
+import { AccountModel } from '../models/account/account'
-import { AccountInstance } from '../models'
+import { VideoChannelModel } from '../models/video/video-channel'
-import { getVideoChannelActivityPubUrl } from './activitypub/url'
+import { getVideoChannelActivityPubUrl } from './activitypub'
-async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account: AccountInstance, t: Sequelize.Transaction) {
+async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account: AccountModel, t: Sequelize.Transaction) {
  const videoChannelData = {
    name: videoChannelInfo.name,
    description: videoChannelInfo.description,
@@ -12,7 +12,7 @@ async function createVideoChannel (videoChannelInfo: VideoChannelCreate, account
    accountId: account.id
  }
-  const videoChannel = db.VideoChannel.build(videoChannelData)
+  const videoChannel = VideoChannelModel.build(videoChannelData)
  videoChannel.set('url', getVideoChannelActivityPubUrl(videoChannel))
  const options = { transaction: t }
diff --git a/server/middlewares/activitypub.ts b/server/middlewares/activitypub.ts
index c2ad18195..489396447 100644
--- a/server/middlewares/activitypub.ts
+++ b/server/middlewares/activitypub.ts
@@ -2,16 +2,16 @@ import { eachSeries } from 'async'
 import { NextFunction, Request, RequestHandler, Response } from 'express'
 import { ActivityPubSignature } from '../../shared'
 import { isSignatureVerified, logger } from '../helpers'
-import { database as db } from '../initializers'
+import { ACCEPT_HEADERS, ACTIVITY_PUB } from '../initializers'
-import { ACCEPT_HEADERS, ACTIVITY_PUB } from '../initializers/constants'
+import { fetchRemoteAccount, saveAccountAndServerIfNotExist } from '../lib/activitypub'
-import { fetchRemoteAccount, saveAccountAndServerIfNotExist } from '../lib/activitypub/account'
+import { AccountModel } from '../models/account/account'
 async function checkSignature (req: Request, res: Response, next: NextFunction) {
  const signatureObject: ActivityPubSignature = req.body.signature
  logger.debug('Checking signature of account %s...', signatureObject.creator)
-  let account = await db.Account.loadByUrl(signatureObject.creator)
+  let account = await AccountModel.loadByUrl(signatureObject.creator)
  // We don't have this account in our database, fetch it on remote
  if (!account) {
diff --git a/server/middlewares/sort.ts b/server/middlewares/sort.ts
index 7b60920de..5d2a43acc 100644
--- a/server/middlewares/sort.ts
+++ b/server/middlewares/sort.ts
@@ -1,8 +1,6 @@
-import 'express-validator'
 import * as express from 'express'
+import 'express-validator'
 import { SortType } from '../helpers'
-import { database } from '../initializers'
 function setUsersSort (req: express.Request, res: express.Response, next: express.NextFunction) {
  if (!req.query.sort) req.query.sort = '-createdAt'
@@ -57,7 +55,7 @@ function setBlacklistSort (req: express.Request, res: express.Response, next: ex
    // If we want to sort onto the BlacklistedVideos relation, we won't specify it in the query parameter ...
    newSort.sortModel = undefined
  } else {
-    newSort.sortModel = database.Video
+    newSort.sortModel = 'Video'
  }
  newSort.sortValue = req.query.sort
diff --git a/server/middlewares/user-right.ts b/server/middlewares/user-right.ts
index bcebe9d7f..5d63ebaf4 100644
--- a/server/middlewares/user-right.ts
+++ b/server/middlewares/user-right.ts
@@ -1,13 +1,12 @@
-import 'express-validator'
 import * as express from 'express'
+import 'express-validator'
-import { UserInstance } from '../models'
 import { UserRight } from '../../shared'
 import { logger } from '../helpers'
+import { UserModel } from '../models/account/user'
 function ensureUserHasRight (userRight: UserRight) {
  return function (req: express.Request, res: express.Response, next: express.NextFunction) {
-    const user: UserInstance = res.locals.oauth.token.user
+    const user = res.locals.oauth.token.user as UserModel
    if (user.hasRight(userRight) === false) {
      logger.info('User %s does not have right %s to access to %s.', user.username, UserRight[userRight], req.path)
      return res.sendStatus(403)
diff --git a/server/middlewares/validators/account.ts b/server/middlewares/validators/account.ts
index 70f4e4d3b..6951dfc80 100644
--- a/server/middlewares/validators/account.ts
+++ b/server/middlewares/validators/account.ts
@@ -1,7 +1,7 @@
 import * as express from 'express'
 import { param } from 'express-validator/check'
-import { logger, isLocalAccountNameExist } from '../../helpers'
+import { logger } from '../../helpers'
-import { isAccountNameValid } from '../../helpers/custom-validators/accounts'
+import { isAccountNameValid, isLocalAccountNameExist } from '../../helpers/custom-validators/accounts'
 import { areValidationErrors } from './utils'
 const localAccountValidator = [
diff --git a/server/middlewares/validators/activitypub/activity.ts b/server/middlewares/validators/activitypub/activity.ts
index c63be5979..e0225f30c 100644
--- a/server/middlewares/validators/activitypub/activity.ts
+++ b/server/middlewares/validators/activitypub/activity.ts
@@ -1,6 +1,7 @@
 import * as express from 'express'
 import { body } from 'express-validator/check'
-import { isRootActivityValid, logger } from '../../../helpers'
+import { logger } from '../../../helpers'
+import { isRootActivityValid } from '../../../helpers/custom-validators/activitypub'
 import { areValidationErrors } from '../utils'
 const activityPubValidator = [
diff --git a/server/middlewares/validators/activitypub/signature.ts b/server/middlewares/validators/activitypub/signature.ts
index 360685512..d41bb6a8d 100644
--- a/server/middlewares/validators/activitypub/signature.ts
+++ b/server/middlewares/validators/activitypub/signature.ts
@@ -1,6 +1,8 @@
 import * as express from 'express'
 import { body } from 'express-validator/check'
-import { isDateValid, isSignatureCreatorValid, isSignatureTypeValid, isSignatureValueValid, logger } from '../../../helpers'
+import { logger } from '../../../helpers'
+import { isSignatureCreatorValid, isSignatureTypeValid, isSignatureValueValid } from '../../../helpers/custom-validators/activitypub'
+import { isDateValid } from '../../../helpers/custom-validators/misc'
 import { areValidationErrors } from '../utils'
 const signatureValidator = [
diff --git a/server/middlewares/validators/follows.ts b/server/middlewares/validators/follows.ts
index 605872ecf..10482e5d0 100644
--- a/server/middlewares/validators/follows.ts
+++ b/server/middlewares/validators/follows.ts
@@ -1,12 +1,11 @@
 import * as express from 'express'
 import { body, param } from 'express-validator/check'
-import { isTestInstance } from '../../helpers/core-utils'
+import { getServerAccount, isTestInstance, logger } from '../../helpers'
+import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
 import { isEachUniqueHostValid } from '../../helpers/custom-validators/servers'
-import { logger } from '../../helpers/logger'
+import { CONFIG } from '../../initializers'
-import { CONFIG, database as db } from '../../initializers'
+import { AccountFollowModel } from '../../models/account/account-follow'
 import { areValidationErrors } from './utils'
-import { getServerAccount } from '../../helpers/utils'
-import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
 const followValidator = [
  body('hosts').custom(isEachUniqueHostValid).withMessage('Should have an array of unique hosts'),
@@ -38,7 +37,7 @@ const removeFollowingValidator = [
    if (areValidationErrors(req, res)) return
    const serverAccount = await getServerAccount()
-    const follow = await db.AccountFollow.loadByAccountAndTarget(serverAccount.id, req.params.accountId)
+    const follow = await AccountFollowModel.loadByAccountAndTarget(serverAccount.id, req.params.accountId)
    if (!follow) {
      return res.status(404)
diff --git a/server/middlewares/validators/oembed.ts b/server/middlewares/validators/oembed.ts
index 31f06dc65..fb7b726e5 100644
--- a/server/middlewares/validators/oembed.ts
+++ b/server/middlewares/validators/oembed.ts
@@ -1,10 +1,11 @@
 import * as express from 'express'
 import { query } from 'express-validator/check'
 import { join } from 'path'
-import { isIdOrUUIDValid, isTestInstance, logger } from '../../helpers'
+import { isTestInstance, logger } from '../../helpers'
+import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
+import { isVideoExist } from '../../helpers/custom-validators/videos'
 import { CONFIG } from '../../initializers'
 import { areValidationErrors } from './utils'
-import { isVideoExist } from '../../helpers/custom-validators/videos'
 const urlShouldStartWith = CONFIG.WEBSERVER.SCHEME + '://' + join(CONFIG.WEBSERVER.HOST, 'videos', 'watch') + '/'
 const videoWatchRegex = new RegExp('([^/]+)$')
diff --git a/server/middlewares/validators/sort.ts b/server/middlewares/validators/sort.ts
index d5822ac81..38184fefa 100644
--- a/server/middlewares/validators/sort.ts
+++ b/server/middlewares/validators/sort.ts
@@ -1,6 +1,5 @@
 import { query } from 'express-validator/check'
 import * as express from 'express'
 import { logger } from '../../helpers'
 import { SORTABLE_COLUMNS } from '../../initializers'
 import { areValidationErrors } from './utils'
diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts
index ac7435b7d..920176d07 100644
--- a/server/middlewares/validators/users.ts
+++ b/server/middlewares/validators/users.ts
@@ -1,18 +1,17 @@
 import * as express from 'express'
 import 'express-validator'
 import { body, param } from 'express-validator/check'
+import { isSignupAllowed, logger } from '../../helpers'
+import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
 import {
-  isIdOrUUIDValid,
-  isSignupAllowed,
  isUserDisplayNSFWValid,
  isUserPasswordValid,
  isUserRoleValid,
  isUserUsernameValid,
-  isUserVideoQuotaValid,
+  isUserVideoQuotaValid
-  logger
+} from '../../helpers/custom-validators/users'
-} from '../../helpers'
 import { isVideoExist } from '../../helpers/custom-validators/videos'
-import { database as db } from '../../initializers/database'
+import { UserModel } from '../../models/account/user'
 import { areValidationErrors } from './utils'
 const usersAddValidator = [
@@ -153,7 +152,7 @@ export {
 // ---------------------------------------------------------------------------
 async function checkUserIdExist (id: number, res: express.Response) {
-  const user = await db.User.loadById(id)
+  const user = await UserModel.loadById(id)
  if (!user) {
    res.status(404)
@@ -168,7 +167,7 @@ async function checkUserIdExist (id: number, res: express.Response) {
 }
 async function checkUserNameOrEmailDoesNotAlreadyExist (username: string, email: string, res: express.Response) {
-  const user = await db.User.loadByUsernameOrEmail(username, email)
+  const user = await UserModel.loadByUsernameOrEmail(username, email)
  if (user) {
    res.status(409)
diff --git a/server/middlewares/validators/utils.ts b/server/middlewares/validators/utils.ts
index ca80acf29..61f76b457 100644
--- a/server/middlewares/validators/utils.ts
+++ b/server/middlewares/validators/utils.ts
@@ -1,6 +1,5 @@
 import * as express from 'express'
 import { validationResult } from 'express-validator/check'
 import { logger } from '../../helpers'
 function areValidationErrors (req: express.Request, res: express.Response) {
diff --git a/server/middlewares/validators/video-blacklist.ts b/server/middlewares/validators/video-blacklist.ts
index f1cc04950..98099fe3f 100644
--- a/server/middlewares/validators/video-blacklist.ts
+++ b/server/middlewares/validators/video-blacklist.ts
@@ -1,9 +1,10 @@
 import * as express from 'express'
 import { param } from 'express-validator/check'
-import { isIdOrUUIDValid, logger } from '../../helpers'
+import { logger } from '../../helpers'
+import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
 import { isVideoExist } from '../../helpers/custom-validators/videos'
-import { database as db } from '../../initializers/database'
+import { VideoModel } from '../../models/video/video'
-import { VideoInstance } from '../../models/video/video-interface'
+import { VideoBlacklistModel } from '../../models/video/video-blacklist'
 import { areValidationErrors } from './utils'
 const videosBlacklistRemoveValidator = [
@@ -42,7 +43,7 @@ export {
 }
 // ---------------------------------------------------------------------------
-function checkVideoIsBlacklistable (video: VideoInstance, res: express.Response) {
+function checkVideoIsBlacklistable (video: VideoModel, res: express.Response) {
  if (video.isOwned() === true) {
    res.status(403)
              .json({ error: 'Cannot blacklist a local video' })
@@ -54,8 +55,8 @@ function checkVideoIsBlacklistable (video: VideoInstance, res: express.Response)
  return true
 }
-async function checkVideoIsBlacklisted (video: VideoInstance, res: express.Response) {
+async function checkVideoIsBlacklisted (video: VideoModel, res: express.Response) {
-  const blacklistedVideo = await db.BlacklistedVideo.loadByVideoId(video.id)
+  const blacklistedVideo = await VideoBlacklistModel.loadByVideoId(video.id)
  if (!blacklistedVideo) {
    res.status(404)
      .send('Blacklisted video not found')
diff --git a/server/middlewares/validators/video-channels.ts b/server/middlewares/validators/video-channels.ts
index 3d31a7e52..660390080 100644
--- a/server/middlewares/validators/video-channels.ts
+++ b/server/middlewares/validators/video-channels.ts
@@ -1,19 +1,18 @@
 import * as express from 'express'
 import { body, param } from 'express-validator/check'
 import { UserRight } from '../../../shared'
-import { isIdValid } from '../../helpers/custom-validators/misc'
+import { logger } from '../../helpers'
+import { isAccountIdExist } from '../../helpers/custom-validators/accounts'
+import { isIdOrUUIDValid, isIdValid } from '../../helpers/custom-validators/misc'
 import {
  isVideoChannelDescriptionValid,
  isVideoChannelExist,
  isVideoChannelNameValid
 } from '../../helpers/custom-validators/video-channels'
-import { isIdOrUUIDValid } from '../../helpers/index'
+import { UserModel } from '../../models/account/user'
-import { logger } from '../../helpers/logger'
+import { VideoChannelModel } from '../../models/video/video-channel'
-import { database as db } from '../../initializers'
+import { VideoChannelShareModel } from '../../models/video/video-channel-share'
-import { UserInstance } from '../../models'
 import { areValidationErrors } from './utils'
-import { isAccountIdExist } from '../../helpers/custom-validators/accounts'
-import { VideoChannelInstance } from '../../models/video/video-channel-interface'
 const listVideoAccountChannelsValidator = [
  param('accountId').custom(isIdOrUUIDValid).withMessage('Should have a valid account id'),
@@ -109,7 +108,7 @@ const videoChannelsShareValidator = [
    if (areValidationErrors(req, res)) return
    if (!await isVideoChannelExist(req.params.id, res)) return
-    const share = await db.VideoChannelShare.load(res.locals.video.id, req.params.accountId, undefined)
+    const share = await VideoChannelShareModel.load(res.locals.video.id, req.params.accountId, undefined)
    if (!share) {
      return res.status(404)
        .end()
@@ -134,7 +133,7 @@ export {
 // ---------------------------------------------------------------------------
-function checkUserCanDeleteVideoChannel (user: UserInstance, videoChannel: VideoChannelInstance, res: express.Response) {
+function checkUserCanDeleteVideoChannel (user: UserModel, videoChannel: VideoChannelModel, res: express.Response) {
  // Retrieve the user who did the request
  if (videoChannel.isOwned() === false) {
    res.status(403)
@@ -159,7 +158,7 @@ function checkUserCanDeleteVideoChannel (user: UserInstance, videoChannel: Video
 }
 async function checkVideoChannelIsNotTheLastOne (res: express.Response) {
-  const count = await db.VideoChannel.countByAccount(res.locals.oauth.token.User.Account.id)
+  const count = await VideoChannelModel.countByAccount(res.locals.oauth.token.User.Account.id)
  if (count <= 1) {
    res.status(409)
diff --git a/server/middlewares/validators/videos.ts b/server/middlewares/validators/videos.ts
index 10625e41d..b52d5f285 100644
--- a/server/middlewares/validators/videos.ts
+++ b/server/middlewares/validators/videos.ts
@@ -1,6 +1,8 @@
 import * as express from 'express'
+import 'express-validator'
 import { body, param, query } from 'express-validator/check'
 import { UserRight, VideoPrivacy } from '../../../shared'
+import { getDurationFromVideoFile, logger } from '../../helpers'
 import { isIdOrUUIDValid, isIdValid } from '../../helpers/custom-validators/misc'
 import {
  isVideoAbuseReasonValid,
@@ -16,12 +18,11 @@ import {
  isVideoRatingTypeValid,
  isVideoTagsValid
 } from '../../helpers/custom-validators/videos'
-import { getDurationFromVideoFile } from '../../helpers/ffmpeg-utils'
-import { logger } from '../../helpers/logger'
 import { CONSTRAINTS_FIELDS } from '../../initializers'
-import { database as db } from '../../initializers/database'
+import { UserModel } from '../../models/account/user'
-import { UserInstance } from '../../models/account/user-interface'
+import { VideoModel } from '../../models/video/video'
-import { VideoInstance } from '../../models/video/video-interface'
+import { VideoChannelModel } from '../../models/video/video-channel'
+import { VideoShareModel } from '../../models/video/video-share'
 import { authenticate } from '../oauth'
 import { areValidationErrors } from './utils'
@@ -48,7 +49,7 @@ const videosAddValidator = [
    const videoFile: Express.Multer.File = req.files['videofile'][0]
    const user = res.locals.oauth.token.User
-    const videoChannel = await db.VideoChannel.loadByIdAndAccount(req.body.channelId, user.Account.id)
+    const videoChannel = await VideoChannelModel.loadByIdAndAccount(req.body.channelId, user.Account.id)
    if (!videoChannel) {
      res.status(400)
        .json({ error: 'Unknown video video channel for this account.' })
@@ -221,7 +222,7 @@ const videosShareValidator = [
    if (areValidationErrors(req, res)) return
    if (!await isVideoExist(req.params.id, res)) return
-    const share = await db.VideoShare.load(req.params.accountId, res.locals.video.id, undefined)
+    const share = await VideoShareModel.load(req.params.accountId, res.locals.video.id, undefined)
    if (!share) {
      return res.status(404)
        .end()
@@ -249,7 +250,7 @@ export {
 // ---------------------------------------------------------------------------
-function checkUserCanDeleteVideo (user: UserInstance, video: VideoInstance, res: express.Response) {
+function checkUserCanDeleteVideo (user: UserModel, video: VideoModel, res: express.Response) {
  // Retrieve the user who did the request
  if (video.isOwned() === false) {
    res.status(403)
diff --git a/server/middlewares/validators/webfinger.ts b/server/middlewares/validators/webfinger.ts
index 34e62c66d..7903c7400 100644
--- a/server/middlewares/validators/webfinger.ts
+++ b/server/middlewares/validators/webfinger.ts
@@ -1,8 +1,8 @@
 import * as express from 'express'
 import { query } from 'express-validator/check'
+import { logger } from '../../helpers'
 import { isWebfingerResourceValid } from '../../helpers/custom-validators/webfinger'
-import { logger } from '../../helpers/logger'
+import { AccountModel } from '../../models/account/account'
-import { database as db } from '../../initializers'
 import { areValidationErrors } from './utils'
 const webfingerValidator = [
@@ -17,7 +17,7 @@ const webfingerValidator = [
    const nameWithHost = req.query.resource.substr(5)
    const [ name ] = nameWithHost.split('@')
-    const account = await db.Account.loadLocalByName(name)
+    const account = await AccountModel.loadLocalByName(name)
    if (!account) {
      return res.status(404)
        .send({ error: 'Account not found' })
diff --git a/server/models/account/account-follow-interface.ts b/server/models/account/account-follow-interface.ts
deleted file mode 100644
index 7975a46f3..000000000
--- a/server/models/account/account-follow-interface.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import * as Bluebird from 'bluebird'
-import * as Sequelize from 'sequelize'
-import { AccountFollow, FollowState } from '../../../shared/models/accounts/follow.model'
-import { ResultList } from '../../../shared/models/result-list.model'
-import { AccountInstance } from './account-interface'
-export namespace AccountFollowMethods {
-  export type LoadByAccountAndTarget = (
-    accountId: number,
-    targetAccountId: number,
-    t?: Sequelize.Transaction
-  ) => Bluebird<AccountFollowInstance>
-  export type ListFollowingForApi = (id: number, start: number, count: number, sort: string) => Bluebird< ResultList<AccountFollowInstance>>
-  export type ListFollowersForApi = (id: number, start: number, count: number, sort: string) => Bluebird< ResultList<AccountFollowInstance>>
-  export type ListAcceptedFollowerUrlsForApi = (
-    accountId: number[],
-    t: Sequelize.Transaction,
-    start?: number,
-    count?: number
-  ) => Promise< ResultList<string> >
-  export type ListAcceptedFollowingUrlsForApi = (
-    accountId: number[],
-    t: Sequelize.Transaction,
-    start?: number,
-    count?: number
-  ) => Promise< ResultList<string> >
-  export type ListAcceptedFollowerSharedInboxUrls = (accountId: number[], t: Sequelize.Transaction) => Promise< ResultList<string> >
-  export type ToFormattedJSON = (this: AccountFollowInstance) => AccountFollow
-}
-export interface AccountFollowClass {
-  loadByAccountAndTarget: AccountFollowMethods.LoadByAccountAndTarget
-  listFollowersForApi: AccountFollowMethods.ListFollowersForApi
-  listFollowingForApi: AccountFollowMethods.ListFollowingForApi
-  listAcceptedFollowerUrlsForApi: AccountFollowMethods.ListAcceptedFollowerUrlsForApi
-  listAcceptedFollowingUrlsForApi: AccountFollowMethods.ListAcceptedFollowingUrlsForApi
-  listAcceptedFollowerSharedInboxUrls: AccountFollowMethods.ListAcceptedFollowerSharedInboxUrls
-}
-export interface AccountFollowAttributes {
-  accountId: number
-  targetAccountId: number
-  state: FollowState
-}
-export interface AccountFollowInstance extends AccountFollowClass, AccountFollowAttributes, Sequelize.Instance<AccountFollowAttributes> {
-  id: number
-  createdAt: Date
-  updatedAt: Date
-  AccountFollower?: AccountInstance
-  AccountFollowing?: AccountInstance
-  toFormattedJSON: AccountFollowMethods.ToFormattedJSON
-}
-export interface AccountFollowModel extends AccountFollowClass, Sequelize.Model<AccountFollowInstance, AccountFollowAttributes> {}
diff --git a/server/models/account/account-follow.ts b/server/models/account/account-follow.ts
index 724f37baa..975e7ee7d 100644
--- a/server/models/account/account-follow.ts
+++ b/server/models/account/account-follow.ts
@@ -1,64 +1,45 @@
+import * as Bluebird from 'bluebird'
 import { values } from 'lodash'
 import * as Sequelize from 'sequelize'
+import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript'
-import { addMethodsToModel, getSort } from '../utils'
+import { FollowState } from '../../../shared/models/accounts'
-import { AccountFollowAttributes, AccountFollowInstance, AccountFollowMethods } from './account-follow-interface'
 import { FOLLOW_STATES } from '../../initializers/constants'
+import { ServerModel } from '../server/server'
+import { getSort } from '../utils'
+import { AccountModel } from './account'
-let AccountFollow: Sequelize.Model<AccountFollowInstance, AccountFollowAttributes>
+@Table({
-let loadByAccountAndTarget: AccountFollowMethods.LoadByAccountAndTarget
+  tableName: 'accountFollow',
-let listFollowingForApi: AccountFollowMethods.ListFollowingForApi
+  indexes: [
-let listFollowersForApi: AccountFollowMethods.ListFollowersForApi
-let listAcceptedFollowerUrlsForApi: AccountFollowMethods.ListAcceptedFollowerUrlsForApi
-let listAcceptedFollowingUrlsForApi: AccountFollowMethods.ListAcceptedFollowingUrlsForApi
-let listAcceptedFollowerSharedInboxUrls: AccountFollowMethods.ListAcceptedFollowerSharedInboxUrls
-let toFormattedJSON: AccountFollowMethods.ToFormattedJSON
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  AccountFollow = sequelize.define<AccountFollowInstance, AccountFollowAttributes>('AccountFollow',
    {
-      state: {
+      fields: [ 'accountId' ]
-        type: DataTypes.ENUM(values(FOLLOW_STATES)),
-        allowNull: false
-      }
    },
    {
-      indexes: [
+      fields: [ 'targetAccountId' ]
-        {
+    },
-          fields: [ 'accountId' ]
+    {
-        },
+      fields: [ 'accountId', 'targetAccountId' ],
-        {
+      unique: true
-          fields: [ 'targetAccountId' ]
-        },
-        {
-          fields: [ 'accountId', 'targetAccountId' ],
-          unique: true
-        }
-      ]
    }
-  )
-  const classMethods = [
-    associate,
-    loadByAccountAndTarget,
-    listFollowingForApi,
-    listFollowersForApi,
-    listAcceptedFollowerUrlsForApi,
-    listAcceptedFollowingUrlsForApi,
-    listAcceptedFollowerSharedInboxUrls
  ]
-  const instanceMethods = [
+})
-    toFormattedJSON
+export class AccountFollowModel extends Model<AccountFollowModel> {
-  ]
-  addMethodsToModel(AccountFollow, classMethods, instanceMethods)
-  return AccountFollow
+  @AllowNull(false)
-}
+  @Column(DataType.ENUM(values(FOLLOW_STATES)))
+  state: FollowState
-// ------------------------------ STATICS ------------------------------
+  @CreatedAt
+  createdAt: Date
-function associate (models) {
+  @UpdatedAt
-  AccountFollow.belongsTo(models.Account, {
+  updatedAt: Date
+  @ForeignKey(() => AccountModel)
+  @Column
+  accountId: number
+  @BelongsTo(() => AccountModel, {
    foreignKey: {
      name: 'accountId',
      allowNull: false
@@ -66,8 +47,13 @@ function associate (models) {
    as: 'AccountFollower',
    onDelete: 'CASCADE'
  })
+  AccountFollower: AccountModel
-  AccountFollow.belongsTo(models.Account, {
+  @ForeignKey(() => AccountModel)
+  @Column
+  targetAccountId: number
+  @BelongsTo(() => AccountModel, {
    foreignKey: {
      name: 'targetAccountId',
      allowNull: false
@@ -75,170 +61,168 @@ function associate (models) {
    as: 'AccountFollowing',
    onDelete: 'CASCADE'
  })
-}
+  AccountFollowing: AccountModel
-toFormattedJSON = function (this: AccountFollowInstance) {
+  static loadByAccountAndTarget (accountId: number, targetAccountId: number, t?: Sequelize.Transaction) {
-  const follower = this.AccountFollower.toFormattedJSON()
+    const query = {
-  const following = this.AccountFollowing.toFormattedJSON()
+      where: {
+        accountId,
-  const json = {
+        targetAccountId
-    id: this.id,
-    follower,
-    following,
-    state: this.state,
-    createdAt: this.createdAt,
-    updatedAt: this.updatedAt
-  }
-  return json
-}
-loadByAccountAndTarget = function (accountId: number, targetAccountId: number, t?: Sequelize.Transaction) {
-  const query = {
-    where: {
-      accountId,
-      targetAccountId
-    },
-    include: [
-      {
-        model: AccountFollow[ 'sequelize' ].models.Account,
-        required: true,
-        as: 'AccountFollower'
      },
-      {
+      include: [
-        model: AccountFollow['sequelize'].models.Account,
+        {
-        required: true,
+          model: AccountModel,
-        as: 'AccountFollowing'
+          required: true,
-      }
+          as: 'AccountFollower'
-    ],
+        },
-    transaction: t
+        {
+          model: AccountModel,
+          required: true,
+          as: 'AccountFollowing'
+        }
+      ],
+      transaction: t
+    }
+    return AccountFollowModel.findOne(query)
  }
-  return AccountFollow.findOne(query)
+  static listFollowingForApi (id: number, start: number, count: number, sort: string) {
-}
+    const query = {
+      distinct: true,
+      offset: start,
+      limit: count,
+      order: [ getSort(sort) ],
+      include: [
+        {
+          model: AccountModel,
+          required: true,
+          as: 'AccountFollower',
+          where: {
+            id
+          }
+        },
+        {
+          model: AccountModel,
+          as: 'AccountFollowing',
+          required: true,
+          include: [ ServerModel ]
+        }
+      ]
+    }
-listFollowingForApi = function (id: number, start: number, count: number, sort: string) {
+    return AccountFollowModel.findAndCountAll(query)
-  const query = {
+      .then(({ rows, count }) => {
-    distinct: true,
+        return {
-    offset: start,
+          data: rows,
-    limit: count,
+          total: count
-    order: [ getSort(sort) ],
-    include: [
-      {
-        model: AccountFollow[ 'sequelize' ].models.Account,
-        required: true,
-        as: 'AccountFollower',
-        where: {
-          id
        }
-      },
+      })
-      {
-        model: AccountFollow['sequelize'].models.Account,
-        as: 'AccountFollowing',
-        required: true,
-        include: [ AccountFollow['sequelize'].models.Server ]
-      }
-    ]
  }
-  return AccountFollow.findAndCountAll(query).then(({ rows, count }) => {
+  static listFollowersForApi (id: number, start: number, count: number, sort: string) {
-    return {
+    const query = {
-      data: rows,
+      distinct: true,
-      total: count
+      offset: start,
+      limit: count,
+      order: [ getSort(sort) ],
+      include: [
+        {
+          model: AccountModel,
+          required: true,
+          as: 'AccountFollower',
+          include: [ ServerModel ]
+        },
+        {
+          model: AccountModel,
+          as: 'AccountFollowing',
+          required: true,
+          where: {
+            id
+          }
+        }
+      ]
    }
-  })
-}
-listFollowersForApi = function (id: number, start: number, count: number, sort: string) {
+    return AccountFollowModel.findAndCountAll(query)
-  const query = {
+      .then(({ rows, count }) => {
-    distinct: true,
+        return {
-    offset: start,
+          data: rows,
-    limit: count,
+          total: count
-    order: [ getSort(sort) ],
-    include: [
-      {
-        model: AccountFollow[ 'sequelize' ].models.Account,
-        required: true,
-        as: 'AccountFollower',
-        include: [ AccountFollow['sequelize'].models.Server ]
-      },
-      {
-        model: AccountFollow['sequelize'].models.Account,
-        as: 'AccountFollowing',
-        required: true,
-        where: {
-          id
        }
-      }
+      })
-    ]
  }
-  return AccountFollow.findAndCountAll(query).then(({ rows, count }) => {
+  static listAcceptedFollowerUrlsForApi (accountIds: number[], t: Sequelize.Transaction, start?: number, count?: number) {
-    return {
+    return AccountFollowModel.createListAcceptedFollowForApiQuery('followers', accountIds, t, start, count)
-      data: rows,
+  }
-      total: count
-    }
-  })
-}
-listAcceptedFollowerUrlsForApi = function (accountIds: number[], t: Sequelize.Transaction, start?: number, count?: number) {
+  static listAcceptedFollowerSharedInboxUrls (accountIds: number[], t: Sequelize.Transaction) {
-  return createListAcceptedFollowForApiQuery('followers', accountIds, t, start, count)
+    return AccountFollowModel.createListAcceptedFollowForApiQuery('followers', accountIds, t, undefined, undefined, 'sharedInboxUrl')
-}
+  }
-listAcceptedFollowerSharedInboxUrls = function (accountIds: number[], t: Sequelize.Transaction) {
+  static listAcceptedFollowingUrlsForApi (accountIds: number[], t: Sequelize.Transaction, start?: number, count?: number) {
-  return createListAcceptedFollowForApiQuery('followers', accountIds, t, undefined, undefined, 'sharedInboxUrl')
+    return AccountFollowModel.createListAcceptedFollowForApiQuery('following', accountIds, t, start, count)
-}
+  }
-listAcceptedFollowingUrlsForApi = function (accountIds: number[], t: Sequelize.Transaction, start?: number, count?: number) {
+  private static async createListAcceptedFollowForApiQuery (type: 'followers' | 'following',
-  return createListAcceptedFollowForApiQuery('following', accountIds, t, start, count)
+                                       accountIds: number[],
-}
+                                       t: Sequelize.Transaction,
+                                       start?: number,
+                                       count?: number,
+                                       columnUrl = 'url') {
+    let firstJoin: string
+    let secondJoin: string
+    if (type === 'followers') {
+      firstJoin = 'targetAccountId'
+      secondJoin = 'accountId'
+    } else {
+      firstJoin = 'accountId'
+      secondJoin = 'targetAccountId'
+    }
-// ------------------------------ UTILS ------------------------------
+    const selections = [ '"Follows"."' + columnUrl + '" AS "url"', 'COUNT(*) AS "total"' ]
+    const tasks: Bluebird<any>[] = []
-async function createListAcceptedFollowForApiQuery (
-  type: 'followers' | 'following',
-  accountIds: number[],
-  t: Sequelize.Transaction,
-  start?: number,
-  count?: number,
-  columnUrl = 'url'
-) {
-  let firstJoin: string
-  let secondJoin: string
-  if (type === 'followers') {
-    firstJoin = 'targetAccountId'
-    secondJoin = 'accountId'
-  } else {
-    firstJoin = 'accountId'
-    secondJoin = 'targetAccountId'
-  }
-  const selections = [ '"Follows"."' + columnUrl + '" AS "url"', 'COUNT(*) AS "total"' ]
+    for (const selection of selections) {
-  const tasks: Promise<any>[] = []
+      let query = 'SELECT ' + selection + ' FROM "account" ' +
+        'INNER JOIN "accountFollow" ON "accountFollow"."' + firstJoin + '" = "account"."id" ' +
+        'INNER JOIN "account" AS "Follows" ON "accountFollow"."' + secondJoin + '" = "Follows"."id" ' +
+        'WHERE "account"."id" = ANY ($accountIds) AND "accountFollow"."state" = \'accepted\' '
-  for (const selection of selections) {
+      if (count !== undefined) query += 'LIMIT ' + count
-    let query = 'SELECT ' + selection + ' FROM "Accounts" ' +
+      if (start !== undefined) query += ' OFFSET ' + start
-      'INNER JOIN "AccountFollows" ON "AccountFollows"."' + firstJoin + '" = "Accounts"."id" ' +
-      'INNER JOIN "Accounts" AS "Follows" ON "AccountFollows"."' + secondJoin + '" = "Follows"."id" ' +
-      'WHERE "Accounts"."id" = ANY ($accountIds) AND "AccountFollows"."state" = \'accepted\' '
-    if (count !== undefined) query += 'LIMIT ' + count
+      const options = {
-    if (start !== undefined) query += ' OFFSET ' + start
+        bind: { accountIds },
+        type: Sequelize.QueryTypes.SELECT,
+        transaction: t
+      }
+      tasks.push(AccountFollowModel.sequelize.query(query, options))
+    }
-    const options = {
+    const [ followers, [ { total } ] ] = await
-      bind: { accountIds },
+    Promise.all(tasks)
-      type: Sequelize.QueryTypes.SELECT,
+    const urls: string[] = followers.map(f => f.url)
-      transaction: t
+    return {
+      data: urls,
+      total: parseInt(total, 10)
    }
-    tasks.push(AccountFollow['sequelize'].query(query, options))
  }
-  const [ followers, [ { total } ]] = await Promise.all(tasks)
+  toFormattedJSON () {
-  const urls: string[] = followers.map(f => f.url)
+    const follower = this.AccountFollower.toFormattedJSON()
+    const following = this.AccountFollowing.toFormattedJSON()
-  return {
+    return {
-    data: urls,
+      id: this.id,
-    total: parseInt(total, 10)
+      follower,
+      following,
+      state: this.state,
+      createdAt: this.createdAt,
+      updatedAt: this.updatedAt
+    }
  }
 }
diff --git a/server/models/account/account-interface.ts b/server/models/account/account-interface.ts
deleted file mode 100644
index 46fe068e3..000000000
--- a/server/models/account/account-interface.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import * as Bluebird from 'bluebird'
-import * as Sequelize from 'sequelize'
-import { Account as FormattedAccount, ActivityPubActor } from '../../../shared'
-import { AvatarInstance } from '../avatar'
-import { ServerInstance } from '../server/server-interface'
-import { VideoChannelInstance } from '../video/video-channel-interface'
-export namespace AccountMethods {
-  export type LoadApplication = () => Bluebird<AccountInstance>
-  export type Load = (id: number) => Bluebird<AccountInstance>
-  export type LoadByUUID = (uuid: string) => Bluebird<AccountInstance>
-  export type LoadByUrl = (url: string, transaction?: Sequelize.Transaction) => Bluebird<AccountInstance>
-  export type LoadLocalByName = (name: string) => Bluebird<AccountInstance>
-  export type LoadByNameAndHost = (name: string, host: string) => Bluebird<AccountInstance>
-  export type ListByFollowersUrls = (followerUrls: string[], transaction: Sequelize.Transaction) => Bluebird<AccountInstance[]>
-  export type ToActivityPubObject = (this: AccountInstance) => ActivityPubActor
-  export type ToFormattedJSON = (this: AccountInstance) => FormattedAccount
-  export type IsOwned = (this: AccountInstance) => boolean
-  export type GetFollowerSharedInboxUrls = (this: AccountInstance, t: Sequelize.Transaction) => Bluebird<string[]>
-  export type GetFollowingUrl = (this: AccountInstance) => string
-  export type GetFollowersUrl = (this: AccountInstance) => string
-  export type GetPublicKeyUrl = (this: AccountInstance) => string
-}
-export interface AccountClass {
-  loadApplication: AccountMethods.LoadApplication
-  load: AccountMethods.Load
-  loadByUUID: AccountMethods.LoadByUUID
-  loadByUrl: AccountMethods.LoadByUrl
-  loadLocalByName: AccountMethods.LoadLocalByName
-  loadByNameAndHost: AccountMethods.LoadByNameAndHost
-  listByFollowersUrls: AccountMethods.ListByFollowersUrls
-}
-export interface AccountAttributes {
-  name: string
-  url?: string
-  publicKey: string
-  privateKey: string
-  followersCount: number
-  followingCount: number
-  inboxUrl: string
-  outboxUrl: string
-  sharedInboxUrl: string
-  followersUrl: string
-  followingUrl: string
-  uuid?: string
-  serverId?: number
-  userId?: number
-  applicationId?: number
-  avatarId?: number
-}
-export interface AccountInstance extends AccountClass, AccountAttributes, Sequelize.Instance<AccountAttributes> {
-  isOwned: AccountMethods.IsOwned
-  toActivityPubObject: AccountMethods.ToActivityPubObject
-  toFormattedJSON: AccountMethods.ToFormattedJSON
-  getFollowerSharedInboxUrls: AccountMethods.GetFollowerSharedInboxUrls
-  getFollowingUrl: AccountMethods.GetFollowingUrl
-  getFollowersUrl: AccountMethods.GetFollowersUrl
-  getPublicKeyUrl: AccountMethods.GetPublicKeyUrl
-  id: number
-  createdAt: Date
-  updatedAt: Date
-  Server: ServerInstance
-  VideoChannels: VideoChannelInstance[]
-  Avatar: AvatarInstance
-}
-export interface AccountModel extends AccountClass, Sequelize.Model<AccountInstance, AccountAttributes> {}
diff --git a/server/models/account/account-video-rate-interface.ts b/server/models/account/account-video-rate-interface.ts
deleted file mode 100644
index 1f395bc45..000000000
--- a/server/models/account/account-video-rate-interface.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
-import { VideoRateType } from '../../../shared/models/videos/video-rate.type'
-import { AccountInstance } from './account-interface'
-export namespace AccountVideoRateMethods {
-  export type Load = (accountId: number, videoId: number, transaction: Sequelize.Transaction) => Promise<AccountVideoRateInstance>
-}
-export interface AccountVideoRateClass {
-  load: AccountVideoRateMethods.Load
-}
-export interface AccountVideoRateAttributes {
-  type: VideoRateType
-  accountId: number
-  videoId: number
-  Account?: AccountInstance
-}
-export interface AccountVideoRateInstance
-  extends AccountVideoRateClass, AccountVideoRateAttributes, Sequelize.Instance<AccountVideoRateAttributes> {
-  id: number
-  createdAt: Date
-  updatedAt: Date
-}
-export interface AccountVideoRateModel
-  extends AccountVideoRateClass, Sequelize.Model<AccountVideoRateInstance, AccountVideoRateAttributes> {}
diff --git a/server/models/account/account-video-rate.ts b/server/models/account/account-video-rate.ts
index d92834bbb..e969e4a43 100644
--- a/server/models/account/account-video-rate.ts
+++ b/server/models/account/account-video-rate.ts
@@ -1,78 +1,69 @@
-/*
-  Account rates per video.
-*/
 import { values } from 'lodash'
-import * as Sequelize from 'sequelize'
+import { Transaction } from 'sequelize'
+import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript'
+import { IFindOptions } from 'sequelize-typescript/lib/interfaces/IFindOptions'
+import { VideoRateType } from '../../../shared/models/videos'
 import { VIDEO_RATE_TYPES } from '../../initializers'
+import { VideoModel } from '../video/video'
+import { AccountModel } from './account'
-import { addMethodsToModel } from '../utils'
+/*
-import {
+  Account rates per video.
-  AccountVideoRateInstance,
+*/
-  AccountVideoRateAttributes,
+@Table({
+  tableName: 'accountVideoRate',
-  AccountVideoRateMethods
+  indexes: [
-} from './account-video-rate-interface'
-let AccountVideoRate: Sequelize.Model<AccountVideoRateInstance, AccountVideoRateAttributes>
-let load: AccountVideoRateMethods.Load
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  AccountVideoRate = sequelize.define<AccountVideoRateInstance, AccountVideoRateAttributes>('AccountVideoRate',
-    {
-      type: {
-        type: DataTypes.ENUM(values(VIDEO_RATE_TYPES)),
-        allowNull: false
-      }
-    },
    {
-      indexes: [
+      fields: [ 'videoId', 'accountId' ],
-        {
+      unique: true
-          fields: [ 'videoId', 'accountId' ],
-          unique: true
-        }
-      ]
    }
-  )
+  ]
+})
+export class AccountVideoRateModel extends Model<AccountVideoRateModel> {
-  const classMethods = [
+  @AllowNull(false)
-    associate,
+  @Column(DataType.ENUM(values(VIDEO_RATE_TYPES)))
+  type: VideoRateType
-    load
+  @CreatedAt
-  ]
+  createdAt: Date
-  addMethodsToModel(AccountVideoRate, classMethods)
-  return AccountVideoRate
+  @UpdatedAt
-}
+  updatedAt: Date
-// ------------------------------ STATICS ------------------------------
+  @ForeignKey(() => VideoModel)
+  @Column
+  videoId: number
-function associate (models) {
+  @BelongsTo(() => VideoModel, {
-  AccountVideoRate.belongsTo(models.Video, {
    foreignKey: {
-      name: 'videoId',
      allowNull: false
    },
    onDelete: 'CASCADE'
  })
+  Video: VideoModel
-  AccountVideoRate.belongsTo(models.Account, {
+  @ForeignKey(() => AccountModel)
+  @Column
+  accountId: number
+  @BelongsTo(() => AccountModel, {
    foreignKey: {
-      name: 'accountId',
      allowNull: false
    },
    onDelete: 'CASCADE'
  })
-}
+  Account: AccountModel
-load = function (accountId: number, videoId: number, transaction: Sequelize.Transaction) {
+  static load (accountId: number, videoId: number, transaction: Transaction) {
-  const options: Sequelize.FindOptions<AccountVideoRateAttributes> = {
+    const options: IFindOptions<AccountVideoRateModel> = {
-    where: {
+      where: {
-      accountId,
+        accountId,
-      videoId
+        videoId
+      }
    }
-  }
+    if (transaction) options.transaction = transaction
-  if (transaction) options.transaction = transaction
-  return AccountVideoRate.findOne(options)
+    return AccountVideoRateModel.findOne(options)
+  }
 }
diff --git a/server/models/account/account.ts b/server/models/account/account.ts
index 8b0819f39..d6758fa10 100644
--- a/server/models/account/account.ts
+++ b/server/models/account/account.ts
@@ -1,253 +1,200 @@
 import { join } from 'path'
 import * as Sequelize from 'sequelize'
+import {
+  AfterDestroy,
+  AllowNull,
+  BelongsTo,
+  Column,
+  CreatedAt,
+  DataType,
+  Default,
+  ForeignKey,
+  HasMany,
+  Is,
+  IsUUID,
+  Model,
+  Table,
+  UpdatedAt
+} from 'sequelize-typescript'
 import { Avatar } from '../../../shared/models/avatars/avatar.model'
+import { activityPubContextify } from '../../helpers'
 import {
-  activityPubContextify,
  isAccountFollowersCountValid,
  isAccountFollowingCountValid,
  isAccountPrivateKeyValid,
  isAccountPublicKeyValid,
-  isUserUsernameValid
+  isActivityPubUrlValid
-} from '../../helpers'
+} from '../../helpers/custom-validators/activitypub'
-import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
+import { isUserUsernameValid } from '../../helpers/custom-validators/users'
-import { AVATARS_DIR } from '../../initializers'
+import { AVATARS_DIR, CONFIG, CONSTRAINTS_FIELDS } from '../../initializers'
-import { CONFIG, CONSTRAINTS_FIELDS } from '../../initializers/constants'
+import { sendDeleteAccount } from '../../lib/activitypub/send'
-import { sendDeleteAccount } from '../../lib/activitypub/send/send-delete'
+import { ApplicationModel } from '../application/application'
-import { addMethodsToModel } from '../utils'
+import { AvatarModel } from '../avatar/avatar'
-import { AccountAttributes, AccountInstance, AccountMethods } from './account-interface'
+import { ServerModel } from '../server/server'
+import { throwIfNotValid } from '../utils'
-let Account: Sequelize.Model<AccountInstance, AccountAttributes>
+import { VideoChannelModel } from '../video/video-channel'
-let load: AccountMethods.Load
+import { AccountFollowModel } from './account-follow'
-let loadApplication: AccountMethods.LoadApplication
+import { UserModel } from './user'
-let loadByUUID: AccountMethods.LoadByUUID
-let loadByUrl: AccountMethods.LoadByUrl
+@Table({
-let loadLocalByName: AccountMethods.LoadLocalByName
+  tableName: 'account',
-let loadByNameAndHost: AccountMethods.LoadByNameAndHost
+  indexes: [
-let listByFollowersUrls: AccountMethods.ListByFollowersUrls
-let isOwned: AccountMethods.IsOwned
-let toActivityPubObject: AccountMethods.ToActivityPubObject
-let toFormattedJSON: AccountMethods.ToFormattedJSON
-let getFollowerSharedInboxUrls: AccountMethods.GetFollowerSharedInboxUrls
-let getFollowingUrl: AccountMethods.GetFollowingUrl
-let getFollowersUrl: AccountMethods.GetFollowersUrl
-let getPublicKeyUrl: AccountMethods.GetPublicKeyUrl
-export default function defineAccount (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  Account = sequelize.define<AccountInstance, AccountAttributes>('Account',
    {
-      uuid: {
+      fields: [ 'name' ]
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
-        allowNull: false,
-        validate: {
-          isUUID: 4
-        }
-      },
-      name: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        validate: {
-          nameValid: value => {
-            const res = isUserUsernameValid(value)
-            if (res === false) throw new Error('Name is not valid.')
-          }
-        }
-      },
-      url: {
-        type: DataTypes.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.URL.max),
-        allowNull: false,
-        validate: {
-          urlValid: value => {
-            const res = isActivityPubUrlValid(value)
-            if (res === false) throw new Error('URL is not valid.')
-          }
-        }
-      },
-      publicKey: {
-        type: DataTypes.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.PUBLIC_KEY.max),
-        allowNull: true,
-        validate: {
-          publicKeyValid: value => {
-            const res = isAccountPublicKeyValid(value)
-            if (res === false) throw new Error('Public key is not valid.')
-          }
-        }
-      },
-      privateKey: {
-        type: DataTypes.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.PRIVATE_KEY.max),
-        allowNull: true,
-        validate: {
-          privateKeyValid: value => {
-            const res = isAccountPrivateKeyValid(value)
-            if (res === false) throw new Error('Private key is not valid.')
-          }
-        }
-      },
-      followersCount: {
-        type: DataTypes.INTEGER,
-        allowNull: false,
-        validate: {
-          followersCountValid: value => {
-            const res = isAccountFollowersCountValid(value)
-            if (res === false) throw new Error('Followers count is not valid.')
-          }
-        }
-      },
-      followingCount: {
-        type: DataTypes.INTEGER,
-        allowNull: false,
-        validate: {
-          followingCountValid: value => {
-            const res = isAccountFollowingCountValid(value)
-            if (res === false) throw new Error('Following count is not valid.')
-          }
-        }
-      },
-      inboxUrl: {
-        type: DataTypes.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.URL.max),
-        allowNull: false,
-        validate: {
-          inboxUrlValid: value => {
-            const res = isActivityPubUrlValid(value)
-            if (res === false) throw new Error('Inbox URL is not valid.')
-          }
-        }
-      },
-      outboxUrl: {
-        type: DataTypes.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.URL.max),
-        allowNull: false,
-        validate: {
-          outboxUrlValid: value => {
-            const res = isActivityPubUrlValid(value)
-            if (res === false) throw new Error('Outbox URL is not valid.')
-          }
-        }
-      },
-      sharedInboxUrl: {
-        type: DataTypes.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.URL.max),
-        allowNull: false,
-        validate: {
-          sharedInboxUrlValid: value => {
-            const res = isActivityPubUrlValid(value)
-            if (res === false) throw new Error('Shared inbox URL is not valid.')
-          }
-        }
-      },
-      followersUrl: {
-        type: DataTypes.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.URL.max),
-        allowNull: false,
-        validate: {
-          followersUrlValid: value => {
-            const res = isActivityPubUrlValid(value)
-            if (res === false) throw new Error('Followers URL is not valid.')
-          }
-        }
-      },
-      followingUrl: {
-        type: DataTypes.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.URL.max),
-        allowNull: false,
-        validate: {
-          followingUrlValid: value => {
-            const res = isActivityPubUrlValid(value)
-            if (res === false) throw new Error('Following URL is not valid.')
-          }
-        }
-      }
    },
    {
-      indexes: [
+      fields: [ 'serverId' ]
-        {
+    },
-          fields: [ 'name' ]
+    {
-        },
+      fields: [ 'userId' ],
-        {
+      unique: true
-          fields: [ 'serverId' ]
+    },
-        },
+    {
-        {
+      fields: [ 'applicationId' ],
-          fields: [ 'userId' ],
+      unique: true
-          unique: true
+    },
-        },
+    {
-        {
+      fields: [ 'name', 'serverId', 'applicationId' ],
-          fields: [ 'applicationId' ],
+      unique: true
-          unique: true
-        },
-        {
-          fields: [ 'name', 'serverId', 'applicationId' ],
-          unique: true
-        }
-      ],
-      hooks: { afterDestroy }
    }
-  )
-  const classMethods = [
-    associate,
-    loadApplication,
-    load,
-    loadByUUID,
-    loadByUrl,
-    loadLocalByName,
-    loadByNameAndHost,
-    listByFollowersUrls
-  ]
-  const instanceMethods = [
-    isOwned,
-    toActivityPubObject,
-    toFormattedJSON,
-    getFollowerSharedInboxUrls,
-    getFollowingUrl,
-    getFollowersUrl,
-    getPublicKeyUrl
  ]
-  addMethodsToModel(Account, classMethods, instanceMethods)
+})
+export class AccountModel extends Model<Account> {
-  return Account
-}
+  @AllowNull(false)
+  @Default(DataType.UUIDV4)
+  @IsUUID(4)
+  @Column(DataType.UUID)
+  uuid: string
+  @AllowNull(false)
+  @Is('AccountName', value => throwIfNotValid(value, isUserUsernameValid, 'account name'))
+  @Column
+  name: string
+  @AllowNull(false)
+  @Is('AccountUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'url'))
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.URL.max))
+  url: string
+  @AllowNull(true)
+  @Is('AccountPublicKey', value => throwIfNotValid(value, isAccountPublicKeyValid, 'public key'))
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.PUBLIC_KEY.max))
+  publicKey: string
+  @AllowNull(true)
+  @Is('AccountPublicKey', value => throwIfNotValid(value, isAccountPrivateKeyValid, 'private key'))
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.PRIVATE_KEY.max))
+  privateKey: string
+  @AllowNull(false)
+  @Is('AccountFollowersCount', value => throwIfNotValid(value, isAccountFollowersCountValid, 'followers count'))
+  @Column
+  followersCount: number
+  @AllowNull(false)
+  @Is('AccountFollowersCount', value => throwIfNotValid(value, isAccountFollowingCountValid, 'following count'))
+  @Column
+  followingCount: number
+  @AllowNull(false)
+  @Is('AccountInboxUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'inbox url'))
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.URL.max))
+  inboxUrl: string
+  @AllowNull(false)
+  @Is('AccountOutboxUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'outbox url'))
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.URL.max))
+  outboxUrl: string
+  @AllowNull(false)
+  @Is('AccountSharedInboxUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'shared inbox url'))
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.URL.max))
+  sharedInboxUrl: string
+  @AllowNull(false)
+  @Is('AccountFollowersUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'followers url'))
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.URL.max))
+  followersUrl: string
+  @AllowNull(false)
+  @Is('AccountFollowingUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'following url'))
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.URL.max))
+  followingUrl: string
+  @CreatedAt
+  createdAt: Date
+  @UpdatedAt
+  updatedAt: Date
+  @ForeignKey(() => AvatarModel)
+  @Column
+  avatarId: number
+  @BelongsTo(() => AvatarModel, {
+    foreignKey: {
+      allowNull: true
+    },
+    onDelete: 'cascade'
+  })
+  Avatar: AvatarModel
-// ---------------------------------------------------------------------------
+  @ForeignKey(() => ServerModel)
+  @Column
+  serverId: number
-function associate (models) {
+  @BelongsTo(() => ServerModel, {
-  Account.belongsTo(models.Server, {
    foreignKey: {
-      name: 'serverId',
      allowNull: true
    },
    onDelete: 'cascade'
  })
+  Server: ServerModel
-  Account.belongsTo(models.User, {
+  @ForeignKey(() => UserModel)
+  @Column
+  userId: number
+  @BelongsTo(() => UserModel, {
    foreignKey: {
-      name: 'userId',
      allowNull: true
    },
    onDelete: 'cascade'
  })
+  User: UserModel
+  @ForeignKey(() => ApplicationModel)
+  @Column
+  applicationId: number
-  Account.belongsTo(models.Application, {
+  @BelongsTo(() => ApplicationModel, {
    foreignKey: {
-      name: 'applicationId',
      allowNull: true
    },
    onDelete: 'cascade'
  })
+  Application: ApplicationModel
-  Account.hasMany(models.VideoChannel, {
+  @HasMany(() => VideoChannelModel, {
    foreignKey: {
-      name: 'accountId',
      allowNull: false
    },
    onDelete: 'cascade',
    hooks: true
  })
+  VideoChannels: VideoChannelModel[]
-  Account.hasMany(models.AccountFollow, {
+  @HasMany(() => AccountFollowModel, {
    foreignKey: {
      name: 'accountId',
      allowNull: false
    },
    onDelete: 'cascade'
  })
+  AccountFollowing: AccountFollowModel[]
-  Account.hasMany(models.AccountFollow, {
+  @HasMany(() => AccountFollowModel, {
    foreignKey: {
      name: 'targetAccountId',
      allowNull: false
@@ -255,209 +202,199 @@ function associate (models) {
    as: 'followers',
    onDelete: 'cascade'
  })
+  AccountFollowers: AccountFollowModel[]
-  Account.hasOne(models.Avatar, {
+  @AfterDestroy
-    foreignKey: {
+  static sendDeleteIfOwned (instance: AccountModel) {
-      name: 'avatarId',
+    if (instance.isOwned()) {
-      allowNull: true
+      return sendDeleteAccount(instance, undefined)
-    },
+    }
-    onDelete: 'cascade'
-  })
-}
-function afterDestroy (account: AccountInstance) {
+    return undefined
-  if (account.isOwned()) {
-    return sendDeleteAccount(account, undefined)
  }
-  return undefined
+  static loadApplication () {
-}
+    return AccountModel.findOne({
+      include: [
+        {
+          model: ApplicationModel,
+          required: true
+        }
+      ]
+    })
+  }
-toFormattedJSON = function (this: AccountInstance) {
+  static load (id: number) {
-  let host = CONFIG.WEBSERVER.HOST
+    return AccountModel.findById(id)
-  let score: number
+  }
-  let avatar: Avatar = null
-  if (this.Avatar) {
+  static loadByUUID (uuid: string) {
-    avatar = {
+    const query = {
-      path: join(AVATARS_DIR.ACCOUNT, this.Avatar.filename),
+      where: {
-      createdAt: this.Avatar.createdAt,
+        uuid
-      updatedAt: this.Avatar.updatedAt
+      }
    }
-  }
-  if (this.Server) {
+    return AccountModel.findOne(query)
-    host = this.Server.host
-    score = this.Server.score as number
  }
-  const json = {
+  static loadLocalByName (name: string) {
-    id: this.id,
+    const query = {
-    uuid: this.uuid,
+      where: {
-    host,
+        name,
-    score,
+        [ Sequelize.Op.or ]: [
-    name: this.name,
+          {
-    followingCount: this.followingCount,
+            userId: {
-    followersCount: this.followersCount,
+              [ Sequelize.Op.ne ]: null
-    createdAt: this.createdAt,
+            }
-    updatedAt: this.updatedAt,
+          },
-    avatar
+          {
-  }
+            applicationId: {
+              [ Sequelize.Op.ne ]: null
+            }
+          }
+        ]
+      }
+    }
-  return json
+    return AccountModel.findOne(query)
-}
+  }
-toActivityPubObject = function (this: AccountInstance) {
+  static loadByNameAndHost (name: string, host: string) {
-  const type = this.serverId ? 'Application' as 'Application' : 'Person' as 'Person'
+    const query = {
+      where: {
-  const json = {
+        name
-    type,
+      },
-    id: this.url,
+      include: [
-    following: this.getFollowingUrl(),
+        {
-    followers: this.getFollowersUrl(),
+          model: ServerModel,
-    inbox: this.inboxUrl,
+          required: true,
-    outbox: this.outboxUrl,
+          where: {
-    preferredUsername: this.name,
+            host
-    url: this.url,
+          }
-    name: this.name,
+        }
-    endpoints: {
+      ]
-      sharedInbox: this.sharedInboxUrl
-    },
-    uuid: this.uuid,
-    publicKey: {
-      id: this.getPublicKeyUrl(),
-      owner: this.url,
-      publicKeyPem: this.publicKey
    }
+    return AccountModel.findOne(query)
  }
-  return activityPubContextify(json)
+  static loadByUrl (url: string, transaction?: Sequelize.Transaction) {
-}
+    const query = {
+      where: {
+        url
+      },
+      transaction
+    }
-isOwned = function (this: AccountInstance) {
+    return AccountModel.findOne(query)
-  return this.serverId === null
+  }
-}
-getFollowerSharedInboxUrls = function (this: AccountInstance, t: Sequelize.Transaction) {
+  static listByFollowersUrls (followersUrls: string[], transaction?: Sequelize.Transaction) {
-  const query: Sequelize.FindOptions<AccountAttributes> = {
+    const query = {
-    attributes: [ 'sharedInboxUrl' ],
+      where: {
-    include: [
+        followersUrl: {
-      {
+          [ Sequelize.Op.in ]: followersUrls
-        model: Account['sequelize'].models.AccountFollow,
-        required: true,
-        as: 'followers',
-        where: {
-          targetAccountId: this.id
        }
-      }
+      },
-    ],
+      transaction
-    transaction: t
+    }
-  }
-  return Account.findAll(query)
+    return AccountModel.findAll(query)
-    .then(accounts => accounts.map(a => a.sharedInboxUrl))
+  }
-}
-getFollowingUrl = function (this: AccountInstance) {
+  toFormattedJSON () {
-  return this.url + '/following'
+    let host = CONFIG.WEBSERVER.HOST
-}
+    let score: number
+    let avatar: Avatar = null
-getFollowersUrl = function (this: AccountInstance) {
+    if (this.Avatar) {
-  return this.url + '/followers'
+      avatar = {
-}
+        path: join(AVATARS_DIR.ACCOUNT, this.Avatar.filename),
+        createdAt: this.Avatar.createdAt,
+        updatedAt: this.Avatar.updatedAt
+      }
+    }
-getPublicKeyUrl = function (this: AccountInstance) {
+    if (this.Server) {
-  return this.url + '#main-key'
+      host = this.Server.host
-}
+      score = this.Server.score
+    }
-// ------------------------------ STATICS ------------------------------
+    return {
+      id: this.id,
+      uuid: this.uuid,
+      host,
+      score,
+      name: this.name,
+      followingCount: this.followingCount,
+      followersCount: this.followersCount,
+      createdAt: this.createdAt,
+      updatedAt: this.updatedAt,
+      avatar
+    }
+  }
-loadApplication = function () {
+  toActivityPubObject () {
-  return Account.findOne({
+    const type = this.serverId ? 'Application' as 'Application' : 'Person' as 'Person'
-    include: [
-      {
+    const json = {
-        model: Account['sequelize'].models.Application,
+      type,
-        required: true
+      id: this.url,
+      following: this.getFollowingUrl(),
+      followers: this.getFollowersUrl(),
+      inbox: this.inboxUrl,
+      outbox: this.outboxUrl,
+      preferredUsername: this.name,
+      url: this.url,
+      name: this.name,
+      endpoints: {
+        sharedInbox: this.sharedInboxUrl
+      },
+      uuid: this.uuid,
+      publicKey: {
+        id: this.getPublicKeyUrl(),
+        owner: this.url,
+        publicKeyPem: this.publicKey
      }
-    ]
-  })
-}
-load = function (id: number) {
-  return Account.findById(id)
-}
-loadByUUID = function (uuid: string) {
-  const query: Sequelize.FindOptions<AccountAttributes> = {
-    where: {
-      uuid
    }
+    return activityPubContextify(json)
  }
-  return Account.findOne(query)
+  isOwned () {
-}
+    return this.serverId === null
+  }
-loadLocalByName = function (name: string) {
+  getFollowerSharedInboxUrls (t: Sequelize.Transaction) {
-  const query: Sequelize.FindOptions<AccountAttributes> = {
+    const query = {
-    where: {
+      attributes: [ 'sharedInboxUrl' ],
-      name,
+      include: [
-      [Sequelize.Op.or]: [
-        {
-          userId: {
-            [Sequelize.Op.ne]: null
-          }
-        },
        {
-          applicationId: {
+          model: AccountFollowModel,
-            [Sequelize.Op.ne]: null
+          required: true,
+          as: 'followers',
+          where: {
+            targetAccountId: this.id
          }
        }
-      ]
+      ],
+      transaction: t
    }
-  }
-  return Account.findOne(query)
+    return AccountModel.findAll(query)
-}
+      .then(accounts => accounts.map(a => a.sharedInboxUrl))
-loadByNameAndHost = function (name: string, host: string) {
-  const query: Sequelize.FindOptions<AccountAttributes> = {
-    where: {
-      name
-    },
-    include: [
-      {
-        model: Account['sequelize'].models.Server,
-        required: true,
-        where: {
-          host
-        }
-      }
-    ]
  }
-  return Account.findOne(query)
+  getFollowingUrl () {
-}
+    return this.url + '/following'
-loadByUrl = function (url: string, transaction?: Sequelize.Transaction) {
-  const query: Sequelize.FindOptions<AccountAttributes> = {
-    where: {
-      url
-    },
-    transaction
  }
-  return Account.findOne(query)
+  getFollowersUrl () {
-}
+    return this.url + '/followers'
-listByFollowersUrls = function (followersUrls: string[], transaction?: Sequelize.Transaction) {
-  const query: Sequelize.FindOptions<AccountAttributes> = {
-    where: {
-      followersUrl: {
-        [Sequelize.Op.in]: followersUrls
-      }
-    },
-    transaction
  }
-  return Account.findAll(query)
+  getPublicKeyUrl () {
+    return this.url + '#main-key'
+  }
 }
diff --git a/server/models/account/index.ts b/server/models/account/index.ts
deleted file mode 100644
index 179f66974..000000000
--- a/server/models/account/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './account-interface'
-export * from './account-follow-interface'
-export * from './account-video-rate-interface'
-export * from './user-interface'
diff --git a/server/models/account/user-interface.ts b/server/models/account/user-interface.ts
deleted file mode 100644
index 0f0b72063..000000000
--- a/server/models/account/user-interface.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import * as Bluebird from 'bluebird'
-import * as Sequelize from 'sequelize'
-import { ResultList } from '../../../shared/models/result-list.model'
-import { UserRight } from '../../../shared/models/users/user-right.enum'
-import { UserRole } from '../../../shared/models/users/user-role'
-import { User as FormattedUser } from '../../../shared/models/users/user.model'
-import { AccountInstance } from './account-interface'
-export namespace UserMethods {
-  export type HasRight = (this: UserInstance, right: UserRight) => boolean
-  export type IsPasswordMatch = (this: UserInstance, password: string) => Promise<boolean>
-  export type ToFormattedJSON = (this: UserInstance) => FormattedUser
-  export type IsAbleToUploadVideo = (this: UserInstance, videoFile: Express.Multer.File) => Promise<boolean>
-  export type CountTotal = () => Bluebird<number>
-  export type GetByUsername = (username: string) => Bluebird<UserInstance>
-  export type ListForApi = (start: number, count: number, sort: string) => Bluebird< ResultList<UserInstance> >
-  export type LoadById = (id: number) => Bluebird<UserInstance>
-  export type LoadByUsername = (username: string) => Bluebird<UserInstance>
-  export type LoadByUsernameAndPopulateChannels = (username: string) => Bluebird<UserInstance>
-  export type LoadByUsernameOrEmail = (username: string, email: string) => Bluebird<UserInstance>
-}
-export interface UserClass {
-  isPasswordMatch: UserMethods.IsPasswordMatch,
-  toFormattedJSON: UserMethods.ToFormattedJSON,
-  hasRight: UserMethods.HasRight,
-  isAbleToUploadVideo: UserMethods.IsAbleToUploadVideo,
-  countTotal: UserMethods.CountTotal,
-  getByUsername: UserMethods.GetByUsername,
-  listForApi: UserMethods.ListForApi,
-  loadById: UserMethods.LoadById,
-  loadByUsername: UserMethods.LoadByUsername,
-  loadByUsernameAndPopulateChannels: UserMethods.LoadByUsernameAndPopulateChannels,
-  loadByUsernameOrEmail: UserMethods.LoadByUsernameOrEmail
-}
-export interface UserAttributes {
-  id?: number
-  password: string
-  username: string
-  email: string
-  displayNSFW?: boolean
-  role: UserRole
-  videoQuota: number
-  Account?: AccountInstance
-}
-export interface UserInstance extends UserClass, UserAttributes, Sequelize.Instance<UserAttributes> {
-  id: number
-  createdAt: Date
-  updatedAt: Date
-  isPasswordMatch: UserMethods.IsPasswordMatch
-  toFormattedJSON: UserMethods.ToFormattedJSON
-  hasRight: UserMethods.HasRight
-}
-export interface UserModel extends UserClass, Sequelize.Model<UserInstance, UserAttributes> {}
diff --git a/server/models/account/user.ts b/server/models/account/user.ts
index 3705947c0..84adad96e 100644
--- a/server/models/account/user.ts
+++ b/server/models/account/user.ts
@@ -1,301 +1,251 @@
 import * as Sequelize from 'sequelize'
+import {
+  AllowNull,
+  BeforeCreate,
+  BeforeUpdate,
+  Column, CreatedAt,
+  DataType,
+  Default,
+  HasMany,
+  HasOne,
+  Is,
+  IsEmail,
+  Model,
+  Table, UpdatedAt
+} from 'sequelize-typescript'
 import { hasUserRight, USER_ROLE_LABELS, UserRight } from '../../../shared'
 import {
  comparePassword,
-  cryptPassword,
+  cryptPassword
-  isUserDisplayNSFWValid,
-  isUserPasswordValid,
-  isUserRoleValid,
-  isUserUsernameValid,
-  isUserVideoQuotaValid
 } from '../../helpers'
-import { addMethodsToModel, getSort } from '../utils'
+import {
-import { UserAttributes, UserInstance, UserMethods } from './user-interface'
+  isUserDisplayNSFWValid, isUserPasswordValid, isUserRoleValid, isUserUsernameValid,
+  isUserVideoQuotaValid
-let User: Sequelize.Model<UserInstance, UserAttributes>
+} from '../../helpers/custom-validators/users'
-let isPasswordMatch: UserMethods.IsPasswordMatch
+import { OAuthTokenModel } from '../oauth/oauth-token'
-let hasRight: UserMethods.HasRight
+import { getSort, throwIfNotValid } from '../utils'
-let toFormattedJSON: UserMethods.ToFormattedJSON
+import { VideoChannelModel } from '../video/video-channel'
-let countTotal: UserMethods.CountTotal
+import { AccountModel } from './account'
-let getByUsername: UserMethods.GetByUsername
-let listForApi: UserMethods.ListForApi
+@Table({
-let loadById: UserMethods.LoadById
+  tableName: 'user',
-let loadByUsername: UserMethods.LoadByUsername
+  indexes: [
-let loadByUsernameAndPopulateChannels: UserMethods.LoadByUsernameAndPopulateChannels
-let loadByUsernameOrEmail: UserMethods.LoadByUsernameOrEmail
-let isAbleToUploadVideo: UserMethods.IsAbleToUploadVideo
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  User = sequelize.define<UserInstance, UserAttributes>('User',
    {
-      password: {
+      fields: [ 'username' ],
-        type: DataTypes.STRING,
+      unique: true
-        allowNull: false,
-        validate: {
-          passwordValid: value => {
-            const res = isUserPasswordValid(value)
-            if (res === false) throw new Error('Password not valid.')
-          }
-        }
-      },
-      username: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        validate: {
-          usernameValid: value => {
-            const res = isUserUsernameValid(value)
-            if (res === false) throw new Error('Username not valid.')
-          }
-        }
-      },
-      email: {
-        type: DataTypes.STRING(400),
-        allowNull: false,
-        validate: {
-          isEmail: true
-        }
-      },
-      displayNSFW: {
-        type: DataTypes.BOOLEAN,
-        allowNull: false,
-        defaultValue: false,
-        validate: {
-          nsfwValid: value => {
-            const res = isUserDisplayNSFWValid(value)
-            if (res === false) throw new Error('Display NSFW is not valid.')
-          }
-        }
-      },
-      role: {
-        type: DataTypes.INTEGER,
-        allowNull: false,
-        validate: {
-          roleValid: value => {
-            const res = isUserRoleValid(value)
-            if (res === false) throw new Error('Role is not valid.')
-          }
-        }
-      },
-      videoQuota: {
-        type: DataTypes.BIGINT,
-        allowNull: false,
-        validate: {
-          videoQuotaValid: value => {
-            const res = isUserVideoQuotaValid(value)
-            if (res === false) throw new Error('Video quota is not valid.')
-          }
-        }
-      }
    },
    {
-      indexes: [
+      fields: [ 'email' ],
-        {
+      unique: true
-          fields: [ 'username' ],
-          unique: true
-        },
-        {
-          fields: [ 'email' ],
-          unique: true
-        }
-      ],
-      hooks: {
-        beforeCreate: beforeCreateOrUpdate,
-        beforeUpdate: beforeCreateOrUpdate
-      }
    }
-  )
-  const classMethods = [
-    associate,
-    countTotal,
-    getByUsername,
-    listForApi,
-    loadById,
-    loadByUsername,
-    loadByUsernameAndPopulateChannels,
-    loadByUsernameOrEmail
  ]
-  const instanceMethods = [
+})
-    hasRight,
+export class UserModel extends Model<UserModel> {
-    isPasswordMatch,
-    toFormattedJSON,
+  @AllowNull(false)
-    isAbleToUploadVideo
+  @Is('UserPassword', value => throwIfNotValid(value, isUserPasswordValid, 'user password'))
-  ]
+  @Column
-  addMethodsToModel(User, classMethods, instanceMethods)
+  password: string
-  return User
+  @AllowNull(false)
-}
+  @Is('UserPassword', value => throwIfNotValid(value, isUserUsernameValid, 'user name'))
+  @Column
+  username: string
+  @AllowNull(false)
+  @IsEmail
+  @Column(DataType.STRING(400))
+  email: string
+  @AllowNull(false)
+  @Default(false)
+  @Is('UserDisplayNSFW', value => throwIfNotValid(value, isUserDisplayNSFWValid, 'display NSFW boolean'))
+  @Column
+  displayNSFW: boolean
+  @AllowNull(false)
+  @Is('UserRole', value => throwIfNotValid(value, isUserRoleValid, 'role'))
+  @Column
+  role: number
+  @AllowNull(false)
+  @Is('UserVideoQuota', value => throwIfNotValid(value, isUserVideoQuotaValid, 'video quota'))
+  @Column(DataType.BIGINT)
+  videoQuota: number
+  @CreatedAt
+  createdAt: Date
+  @UpdatedAt
+  updatedAt: Date
+  @HasOne(() => AccountModel, {
+    foreignKey: 'userId',
+    onDelete: 'cascade'
+  })
+  Account: AccountModel
-function beforeCreateOrUpdate (user: UserInstance) {
+  @HasMany(() => OAuthTokenModel, {
-  if (user.changed('password')) {
+    foreignKey: 'userId',
-    return cryptPassword(user.password)
+    onDelete: 'cascade'
-      .then(hash => {
+  })
-        user.password = hash
+  OAuthTokens: OAuthTokenModel[]
-        return undefined
-      })
+  @BeforeCreate
+  @BeforeUpdate
+  static cryptPasswordIfNeeded (instance: UserModel) {
+    if (instance.changed('password')) {
+      return cryptPassword(instance.password)
+        .then(hash => {
+          instance.password = hash
+          return undefined
+        })
+    }
  }
-}
-// ------------------------------ METHODS ------------------------------
-hasRight = function (this: UserInstance, right: UserRight) {
+  static countTotal () {
-  return hasUserRight(this.role, right)
+    return this.count()
-}
+  }
-isPasswordMatch = function (this: UserInstance, password: string) {
+  static getByUsername (username: string) {
-  return comparePassword(password, this.password)
+    const query = {
-}
+      where: {
+        username: username
+      },
+      include: [ { model: AccountModel, required: true } ]
+    }
-toFormattedJSON = function (this: UserInstance) {
+    return UserModel.findOne(query)
-  const json = {
-    id: this.id,
-    username: this.username,
-    email: this.email,
-    displayNSFW: this.displayNSFW,
-    role: this.role,
-    roleLabel: USER_ROLE_LABELS[this.role],
-    videoQuota: this.videoQuota,
-    createdAt: this.createdAt,
-    account: this.Account.toFormattedJSON()
  }
-  if (Array.isArray(this.Account.VideoChannels) === true) {
+  static listForApi (start: number, count: number, sort: string) {
-    const videoChannels = this.Account.VideoChannels
+    const query = {
-      .map(c => c.toFormattedJSON())
+      offset: start,
-      .sort((v1, v2) => {
+      limit: count,
-        if (v1.createdAt < v2.createdAt) return -1
+      order: [ getSort(sort) ],
-        if (v1.createdAt === v2.createdAt) return 0
+      include: [ { model: AccountModel, required: true } ]
+    }
-        return 1
+    return UserModel.findAndCountAll(query)
+      .then(({ rows, count }) => {
+        return {
+          data: rows,
+          total: count
+        }
      })
-    json['videoChannels'] = videoChannels
  }
-  return json
+  static loadById (id: number) {
-}
+    const options = {
+      include: [ { model: AccountModel, required: true } ]
-isAbleToUploadVideo = function (this: UserInstance, videoFile: Express.Multer.File) {
+    }
-  if (this.videoQuota === -1) return Promise.resolve(true)
-  return getOriginalVideoFileTotalFromUser(this).then(totalBytes => {
-    return (videoFile.size + totalBytes) < this.videoQuota
-  })
-}
-// ------------------------------ STATICS ------------------------------
-function associate (models) {
-  User.hasOne(models.Account, {
-    foreignKey: 'userId',
-    onDelete: 'cascade'
-  })
-  User.hasMany(models.OAuthToken, {
+    return UserModel.findById(id, options)
-    foreignKey: 'userId',
+  }
-    onDelete: 'cascade'
-  })
-}
-countTotal = function () {
+  static loadByUsername (username: string) {
-  return this.count()
+    const query = {
-}
+      where: {
+        username
+      },
+      include: [ { model: AccountModel, required: true } ]
+    }
-getByUsername = function (username: string) {
+    return UserModel.findOne(query)
-  const query = {
-    where: {
-      username: username
-    },
-    include: [ { model: User['sequelize'].models.Account, required: true } ]
  }
-  return User.findOne(query)
+  static loadByUsernameAndPopulateChannels (username: string) {
-}
+    const query = {
+      where: {
+        username
+      },
+      include: [
+        {
+          model: AccountModel,
+          required: true,
+          include: [ VideoChannelModel ]
+        }
+      ]
+    }
-listForApi = function (start: number, count: number, sort: string) {
+    return UserModel.findOne(query)
-  const query = {
-    offset: start,
-    limit: count,
-    order: [ getSort(sort) ],
-    include: [ { model: User['sequelize'].models.Account, required: true } ]
  }
-  return User.findAndCountAll(query).then(({ rows, count }) => {
+  static loadByUsernameOrEmail (username: string, email: string) {
-    return {
+    const query = {
-      data: rows,
+      include: [ { model: AccountModel, required: true } ],
-      total: count
+      where: {
+        [ Sequelize.Op.or ]: [ { username }, { email } ]
+      }
    }
-  })
-}
-loadById = function (id: number) {
+    // FIXME: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/18387
-  const options = {
+    return (UserModel as any).findOne(query)
-    include: [ { model: User['sequelize'].models.Account, required: true } ]
  }
-  return User.findById(id, options)
+  private static getOriginalVideoFileTotalFromUser (user: UserModel) {
-}
+    // Don't use sequelize because we need to use a sub query
+    const query = 'SELECT SUM("size") AS "total" FROM ' +
+      '(SELECT MAX("videoFile"."size") AS "size" FROM "videoFile" ' +
+      'INNER JOIN "video" ON "videoFile"."videoId" = "video"."id" ' +
+      'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' +
+      'INNER JOIN "account" ON "videoChannel"."accountId" = "account"."id" ' +
+      'INNER JOIN "user" ON "account"."userId" = "user"."id" ' +
+      'WHERE "user"."id" = $userId GROUP BY "video"."id") t'
+    const options = {
+      bind: { userId: user.id },
+      type: Sequelize.QueryTypes.SELECT
+    }
+    return UserModel.sequelize.query(query, options)
+      .then(([ { total } ]) => {
+        if (total === null) return 0
-loadByUsername = function (username: string) {
+        return parseInt(total, 10)
-  const query = {
+      })
-    where: {
-      username
-    },
-    include: [ { model: User['sequelize'].models.Account, required: true } ]
  }
-  return User.findOne(query)
+  hasRight (right: UserRight) {
-}
+    return hasUserRight(this.role, right)
+  }
-loadByUsernameAndPopulateChannels = function (username: string) {
+  isPasswordMatch (password: string) {
-  const query = {
+    return comparePassword(password, this.password)
-    where: {
-      username
-    },
-    include: [
-      {
-        model: User['sequelize'].models.Account,
-        required: true,
-        include: [ User['sequelize'].models.VideoChannel ]
-      }
-    ]
  }
-  return User.findOne(query)
+  toFormattedJSON () {
-}
+    const json = {
+      id: this.id,
+      username: this.username,
+      email: this.email,
+      displayNSFW: this.displayNSFW,
+      role: this.role,
+      roleLabel: USER_ROLE_LABELS[ this.role ],
+      videoQuota: this.videoQuota,
+      createdAt: this.createdAt,
+      account: this.Account.toFormattedJSON()
+    }
+    if (Array.isArray(this.Account.VideoChannels) === true) {
+      json['videoChannels'] = this.Account.VideoChannels
+        .map(c => c.toFormattedJSON())
+        .sort((v1, v2) => {
+          if (v1.createdAt < v2.createdAt) return -1
+          if (v1.createdAt === v2.createdAt) return 0
-loadByUsernameOrEmail = function (username: string, email: string) {
+          return 1
-  const query = {
+        })
-    include: [ { model: User['sequelize'].models.Account, required: true } ],
-    where: {
-      [Sequelize.Op.or]: [ { username }, { email } ]
    }
+    return json
  }
-  // FIXME: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/18387
+  isAbleToUploadVideo (videoFile: Express.Multer.File) {
-  return (User as any).findOne(query)
+    if (this.videoQuota === -1) return Promise.resolve(true)
-}
-// ---------------------------------------------------------------------------
+    return UserModel.getOriginalVideoFileTotalFromUser(this)
+      .then(totalBytes => {
-function getOriginalVideoFileTotalFromUser (user: UserInstance) {
+        return (videoFile.size + totalBytes) < this.videoQuota
-  // Don't use sequelize because we need to use a sub query
+      })
-  const query = 'SELECT SUM("size") AS "total" FROM ' +
-                '(SELECT MAX("VideoFiles"."size") AS "size" FROM "VideoFiles" ' +
-                'INNER JOIN "Videos" ON "VideoFiles"."videoId" = "Videos"."id" ' +
-                'INNER JOIN "VideoChannels" ON "VideoChannels"."id" = "Videos"."channelId" ' +
-                'INNER JOIN "Accounts" ON "VideoChannels"."accountId" = "Accounts"."id" ' +
-                'INNER JOIN "Users" ON "Accounts"."userId" = "Users"."id" ' +
-                'WHERE "Users"."id" = $userId GROUP BY "Videos"."id") t'
-  const options = {
-    bind: { userId: user.id },
-    type: Sequelize.QueryTypes.SELECT
  }
-  return User['sequelize'].query(query, options).then(([ { total } ]) => {
-    if (total === null) return 0
-    return parseInt(total, 10)
-  })
 }
diff --git a/server/models/application/application-interface.ts b/server/models/application/application-interface.ts
deleted file mode 100644
index 2c391dba3..000000000
--- a/server/models/application/application-interface.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import * as Sequelize from 'sequelize'
-import * as Bluebird from 'bluebird'
-export namespace ApplicationMethods {
-  export type LoadMigrationVersion = () => Bluebird<number>
-  export type UpdateMigrationVersion = (
-    newVersion: number,
-    transaction: Sequelize.Transaction
-  ) => Bluebird<[ number, ApplicationInstance[] ]>
-  export type CountTotal = () => Bluebird<number>
-}
-export interface ApplicationClass {
-  loadMigrationVersion: ApplicationMethods.LoadMigrationVersion
-  updateMigrationVersion: ApplicationMethods.UpdateMigrationVersion
-  countTotal: ApplicationMethods.CountTotal
-}
-export interface ApplicationAttributes {
-  migrationVersion: number
-}
-export interface ApplicationInstance extends ApplicationClass, ApplicationAttributes, Sequelize.Instance<ApplicationAttributes> {
-  id: number
-  createdAt: Date
-  updatedAt: Date
-}
-export interface ApplicationModel extends ApplicationClass, Sequelize.Model<ApplicationInstance, ApplicationAttributes> {}
diff --git a/server/models/application/application.ts b/server/models/application/application.ts
index 8ba40a895..f3c0f1052 100644
--- a/server/models/application/application.ts
+++ b/server/models/application/application.ts
@@ -1,61 +1,35 @@
-import * as Sequelize from 'sequelize'
+import { Transaction } from 'sequelize'
+import { AllowNull, Column, Default, IsInt, Model, Table } from 'sequelize-typescript'
-import { addMethodsToModel } from '../utils'
-import {
+@Table({
-  ApplicationAttributes,
+  tableName: 'application'
-  ApplicationInstance,
+})
+export class ApplicationModel extends Model<ApplicationModel> {
-  ApplicationMethods
-} from './application-interface'
+  @AllowNull(false)
+  @Default(0)
-let Application: Sequelize.Model<ApplicationInstance, ApplicationAttributes>
+  @IsInt
-let loadMigrationVersion: ApplicationMethods.LoadMigrationVersion
+  @Column
-let updateMigrationVersion: ApplicationMethods.UpdateMigrationVersion
+  migrationVersion: number
-let countTotal: ApplicationMethods.CountTotal
+  static countTotal () {
+    return ApplicationModel.count()
+  }
-export default function defineApplication (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
+  static loadMigrationVersion () {
-  Application = sequelize.define<ApplicationInstance, ApplicationAttributes>('Application',
+    const query = {
-    {
+      attributes: [ 'migrationVersion' ]
-      migrationVersion: {
-        type: DataTypes.INTEGER,
-        defaultValue: 0,
-        allowNull: false,
-        validate: {
-          isInt: true
-        }
-      }
    }
-  )
-  const classMethods = [
-    countTotal,
-    loadMigrationVersion,
-    updateMigrationVersion
-  ]
-  addMethodsToModel(Application, classMethods)
-  return Application
-}
-// ---------------------------------------------------------------------------
+    return ApplicationModel.findOne(query).then(data => data ? data.migrationVersion : null)
-countTotal = function () {
-  return this.count()
-}
-loadMigrationVersion = function () {
-  const query = {
-    attributes: [ 'migrationVersion' ]
  }
-  return Application.findOne(query).then(data => data ? data.migrationVersion : null)
+  static updateMigrationVersion (newVersion: number, transaction: Transaction) {
-}
+    const options = {
+      where: {},
+      transaction: transaction
+    }
-updateMigrationVersion = function (newVersion: number, transaction: Sequelize.Transaction) {
+    return ApplicationModel.update({ migrationVersion: newVersion }, options)
-  const options: Sequelize.UpdateOptions = {
-    where: {},
-    transaction: transaction
  }
-  return Application.update({ migrationVersion: newVersion }, options)
 }
diff --git a/server/models/application/index.ts b/server/models/application/index.ts
deleted file mode 100644
index 706f85cb9..000000000
--- a/server/models/application/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './application-interface'
diff --git a/server/models/avatar/avatar-interface.ts b/server/models/avatar/avatar-interface.ts
deleted file mode 100644
index 4af2b87b7..000000000
--- a/server/models/avatar/avatar-interface.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import * as Sequelize from 'sequelize'
-export namespace AvatarMethods {}
-export interface AvatarClass {}
-export interface AvatarAttributes {
-  filename: string
-}
-export interface AvatarInstance extends AvatarClass, AvatarAttributes, Sequelize.Instance<AvatarAttributes> {
-  createdAt: Date
-  updatedAt: Date
-}
-export interface AvatarModel extends AvatarClass, Sequelize.Model<AvatarInstance, AvatarAttributes> {}
diff --git a/server/models/avatar/avatar.ts b/server/models/avatar/avatar.ts
index 96308fd5f..2e7a8ae2c 100644
--- a/server/models/avatar/avatar.ts
+++ b/server/models/avatar/avatar.ts
@@ -1,24 +1,17 @@
-import * as Sequelize from 'sequelize'
+import { AllowNull, Column, CreatedAt, Model, Table, UpdatedAt } from 'sequelize-typescript'
-import { addMethodsToModel } from '../utils'
-import { AvatarAttributes, AvatarInstance } from './avatar-interface'
-let Avatar: Sequelize.Model<AvatarInstance, AvatarAttributes>
+@Table({
+  tableName: 'avatar'
+})
+export class AvatarModel extends Model<AvatarModel> {
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
+  @AllowNull(false)
-  Avatar = sequelize.define<AvatarInstance, AvatarAttributes>('Avatar',
+  @Column
-    {
+  filename: string
-      filename: {
-        type: DataTypes.STRING,
-        allowNull: false
-      }
-    },
-    {}
-  )
-  const classMethods = []
+  @CreatedAt
-  addMethodsToModel(Avatar, classMethods)
+  createdAt: Date
-  return Avatar
+  @UpdatedAt
+  updatedAt: Date
 }
-// ------------------------------ Statics ------------------------------
diff --git a/server/models/avatar/index.ts b/server/models/avatar/index.ts
deleted file mode 100644
index 877aed1ce..000000000
--- a/server/models/avatar/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './avatar-interface'
diff --git a/server/models/index.ts b/server/models/index.ts
deleted file mode 100644
index fedd97dd1..000000000
--- a/server/models/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from './application'
-export * from './avatar'
-export * from './job'
-export * from './oauth'
-export * from './server'
-export * from './account'
-export * from './video'
diff --git a/server/models/job/index.ts b/server/models/job/index.ts
deleted file mode 100644
index 56925fd32..000000000
--- a/server/models/job/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './job-interface'
diff --git a/server/models/job/job-interface.ts b/server/models/job/job-interface.ts
deleted file mode 100644
index 3cfc0fbed..000000000
--- a/server/models/job/job-interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import * as Bluebird from 'bluebird'
-import * as Sequelize from 'sequelize'
-import { Job as FormattedJob, JobCategory, JobState } from '../../../shared/models/job.model'
-import { ResultList } from '../../../shared/models/result-list.model'
-export namespace JobMethods {
-  export type ListWithLimitByCategory = (limit: number, state: JobState, category: JobCategory) => Bluebird<JobInstance[]>
-  export type ListForApi = (start: number, count: number, sort: string) => Bluebird< ResultList<JobInstance> >
-  export type ToFormattedJSON = (this: JobInstance) => FormattedJob
-}
-export interface JobClass {
-  listWithLimitByCategory: JobMethods.ListWithLimitByCategory
-  listForApi: JobMethods.ListForApi,
-}
-export interface JobAttributes {
-  state: JobState
-  category: JobCategory
-  handlerName: string
-  handlerInputData: any
-}
-export interface JobInstance extends JobClass, JobAttributes, Sequelize.Instance<JobAttributes> {
-  id: number
-  createdAt: Date
-  updatedAt: Date
-  toFormattedJSON: JobMethods.ToFormattedJSON
-}
-export interface JobModel extends JobClass, Sequelize.Model<JobInstance, JobAttributes> {}
diff --git a/server/models/job/job.ts b/server/models/job/job.ts
index f428e26db..35c357e69 100644
--- a/server/models/job/job.ts
+++ b/server/models/job/job.ts
@@ -1,96 +1,79 @@
 import { values } from 'lodash'
-import * as Sequelize from 'sequelize'
+import { AllowNull, Column, CreatedAt, DataType, Model, Table, UpdatedAt } from 'sequelize-typescript'
-import { JobCategory, JobState } from '../../../shared/models/job.model'
+import { JobCategory, JobState } from '../../../shared/models'
 import { JOB_CATEGORIES, JOB_STATES } from '../../initializers'
-import { addMethodsToModel, getSort } from '../utils'
+import { getSort } from '../utils'
-import { JobAttributes, JobInstance, JobMethods } from './job-interface'
-let Job: Sequelize.Model<JobInstance, JobAttributes>
+@Table({
-let listWithLimitByCategory: JobMethods.ListWithLimitByCategory
+  tableName: 'job',
-let listForApi: JobMethods.ListForApi
+  indexes: [
-let toFormattedJSON: JobMethods.ToFormattedJSON
-export default function defineJob (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  Job = sequelize.define<JobInstance, JobAttributes>('Job',
-    {
-      state: {
-        type: DataTypes.ENUM(values(JOB_STATES)),
-        allowNull: false
-      },
-      category: {
-        type: DataTypes.ENUM(values(JOB_CATEGORIES)),
-        allowNull: false
-      },
-      handlerName: {
-        type: DataTypes.STRING,
-        allowNull: false
-      },
-      handlerInputData: {
-        type: DataTypes.JSON,
-        allowNull: true
-      }
-    },
    {
-      indexes: [
+      fields: [ 'state', 'category' ]
-        {
-          fields: [ 'state', 'category' ]
-        }
-      ]
    }
-  )
-  const classMethods = [
-    listWithLimitByCategory,
-    listForApi
  ]
-  const instanceMethods = [
+})
-    toFormattedJSON
+export class JobModel extends Model<JobModel> {
-  ]
+  @AllowNull(false)
-  addMethodsToModel(Job, classMethods, instanceMethods)
+  @Column(DataType.ENUM(values(JOB_STATES)))
+  state: JobState
-  return Job
+  @AllowNull(false)
-}
+  @Column(DataType.ENUM(values(JOB_CATEGORIES)))
+  category: JobCategory
-toFormattedJSON = function (this: JobInstance) {
+  @AllowNull(false)
-  return {
+  @Column
-    id: this.id,
+  handlerName: string
-    state: this.state,
-    category: this.category,
-    handlerName: this.handlerName,
-    handlerInputData: this.handlerInputData,
-    createdAt: this.createdAt,
-    updatedAt: this.updatedAt
-  }
-}
-// ---------------------------------------------------------------------------
+  @AllowNull(true)
+  @Column(DataType.JSON)
+  handlerInputData: any
-listWithLimitByCategory = function (limit: number, state: JobState, jobCategory: JobCategory) {
+  @CreatedAt
-  const query = {
+  creationDate: Date
-    order: [
-      [ 'id', 'ASC' ]
+  @UpdatedAt
-    ],
+  updatedOn: Date
-    limit: limit,
-    where: {
+  static listWithLimitByCategory (limit: number, state: JobState, jobCategory: JobCategory) {
-      state,
+    const query = {
-      category: jobCategory
+      order: [
+        [ 'id', 'ASC' ]
+      ],
+      limit: limit,
+      where: {
+        state,
+        category: jobCategory
+      }
    }
+    return JobModel.findAll(query)
  }
-  return Job.findAll(query)
+  static listForApi (start: number, count: number, sort: string) {
-}
+    const query = {
+      offset: start,
+      limit: count,
+      order: [ getSort(sort) ]
+    }
-listForApi = function (start: number, count: number, sort: string) {
+    return JobModel.findAndCountAll(query).then(({ rows, count }) => {
-  const query = {
+      return {
-    offset: start,
+        data: rows,
-    limit: count,
+        total: count
-    order: [ getSort(sort) ]
+      }
+    })
  }
-  return Job.findAndCountAll(query).then(({ rows, count }) => {
+  toFormattedJSON () {
    return {
-      data: rows,
+      id: this.id,
-      total: count
+      state: this.state,
+      category: this.category,
+      handlerName: this.handlerName,
+      handlerInputData: this.handlerInputData,
+      createdAt: this.createdAt,
+      updatedAt: this.updatedAt
    }
-  })
+  }
 }
diff --git a/server/models/oauth/index.ts b/server/models/oauth/index.ts
deleted file mode 100644
index a20d3a56a..000000000
--- a/server/models/oauth/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './oauth-client-interface'
-export * from './oauth-token-interface'
diff --git a/server/models/oauth/oauth-client-interface.ts b/server/models/oauth/oauth-client-interface.ts
deleted file mode 100644
index 3526e4159..000000000
--- a/server/models/oauth/oauth-client-interface.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
-export namespace OAuthClientMethods {
-  export type CountTotal = () => Promise<number>
-  export type LoadFirstClient = () => Promise<OAuthClientInstance>
-  export type GetByIdAndSecret = (clientId: string, clientSecret: string) => Promise<OAuthClientInstance>
-}
-export interface OAuthClientClass {
-  countTotal: OAuthClientMethods.CountTotal
-  loadFirstClient: OAuthClientMethods.LoadFirstClient
-  getByIdAndSecret: OAuthClientMethods.GetByIdAndSecret
-}
-export interface OAuthClientAttributes {
-  clientId: string
-  clientSecret: string
-  grants: string[]
-  redirectUris: string[]
-}
-export interface OAuthClientInstance extends OAuthClientClass, OAuthClientAttributes, Sequelize.Instance<OAuthClientAttributes> {
-  id: number
-  createdAt: Date
-  updatedAt: Date
-}
-export interface OAuthClientModel extends OAuthClientClass, Sequelize.Model<OAuthClientInstance, OAuthClientAttributes> {}
diff --git a/server/models/oauth/oauth-client.ts b/server/models/oauth/oauth-client.ts
index 9cc68771d..42c59bb79 100644
--- a/server/models/oauth/oauth-client.ts
+++ b/server/models/oauth/oauth-client.ts
@@ -1,86 +1,62 @@
-import * as Sequelize from 'sequelize'
+import { AllowNull, Column, CreatedAt, DataType, HasMany, Model, Table, UpdatedAt } from 'sequelize-typescript'
+import { OAuthTokenModel } from './oauth-token'
-import { addMethodsToModel } from '../utils'
+@Table({
-import {
+  tableName: 'oAuthClient',
-  OAuthClientInstance,
+  indexes: [
-  OAuthClientAttributes,
-  OAuthClientMethods
-} from './oauth-client-interface'
-let OAuthClient: Sequelize.Model<OAuthClientInstance, OAuthClientAttributes>
-let countTotal: OAuthClientMethods.CountTotal
-let loadFirstClient: OAuthClientMethods.LoadFirstClient
-let getByIdAndSecret: OAuthClientMethods.GetByIdAndSecret
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  OAuthClient = sequelize.define<OAuthClientInstance, OAuthClientAttributes>('OAuthClient',
    {
-      clientId: {
+      fields: [ 'clientId' ],
-        type: DataTypes.STRING,
+      unique: true
-        allowNull: false
-      },
-      clientSecret: {
-        type: DataTypes.STRING,
-        allowNull: false
-      },
-      grants: {
-        type: DataTypes.ARRAY(DataTypes.STRING)
-      },
-      redirectUris: {
-        type: DataTypes.ARRAY(DataTypes.STRING)
-      }
    },
    {
-      indexes: [
+      fields: [ 'clientId', 'clientSecret' ],
-        {
+      unique: true
-          fields: [ 'clientId' ],
-          unique: true
-        },
-        {
-          fields: [ 'clientId', 'clientSecret' ],
-          unique: true
-        }
-      ]
    }
-  )
+  ]
+})
+export class OAuthClientModel extends Model<OAuthClientModel> {
-  const classMethods = [
+  @AllowNull(false)
-    associate,
+  @Column
+  clientId: string
-    countTotal,
+  @AllowNull(false)
-    getByIdAndSecret,
+  @Column
-    loadFirstClient
+  clientSecret: string
-  ]
-  addMethodsToModel(OAuthClient, classMethods)
-  return OAuthClient
+  @Column(DataType.ARRAY(DataType.STRING))
-}
+  grants: string[]
+  @Column(DataType.ARRAY(DataType.STRING))
+  redirectUris: string[]
+  @CreatedAt
+  createdAt: Date
-// ---------------------------------------------------------------------------
+  @UpdatedAt
+  updatedAt: Date
-function associate (models) {
+  @HasMany(() => OAuthTokenModel, {
-  OAuthClient.hasMany(models.OAuthToken, {
-    foreignKey: 'oAuthClientId',
    onDelete: 'cascade'
  })
-}
+  OAuthTokens: OAuthTokenModel[]
-countTotal = function () {
+  static countTotal () {
-  return OAuthClient.count()
+    return OAuthClientModel.count()
-}
+  }
-loadFirstClient = function () {
+  static loadFirstClient () {
-  return OAuthClient.findOne()
+    return OAuthClientModel.findOne()
-}
+  }
-getByIdAndSecret = function (clientId: string, clientSecret: string) {
+  static getByIdAndSecret (clientId: string, clientSecret: string) {
-  const query = {
+    const query = {
-    where: {
+      where: {
-      clientId: clientId,
+        clientId: clientId,
-      clientSecret: clientSecret
+        clientSecret: clientSecret
+      }
    }
-  }
-  return OAuthClient.findOne(query)
+    return OAuthClientModel.findOne(query)
+  }
 }
diff --git a/server/models/oauth/oauth-token-interface.ts b/server/models/oauth/oauth-token-interface.ts
deleted file mode 100644
index 47d95d5fc..000000000
--- a/server/models/oauth/oauth-token-interface.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import * as Promise from 'bluebird'
-import * as Sequelize from 'sequelize'
-import { UserModel } from '../account/user-interface'
-export type OAuthTokenInfo = {
-  refreshToken: string
-  refreshTokenExpiresAt: Date,
-  client: {
-    id: number
-  },
-  user: {
-    id: number
-  }
-}
-export namespace OAuthTokenMethods {
-  export type GetByRefreshTokenAndPopulateClient = (refreshToken: string) => Promise<OAuthTokenInfo>
-  export type GetByTokenAndPopulateUser = (bearerToken: string) => Promise<OAuthTokenInstance>
-  export type GetByRefreshTokenAndPopulateUser = (refreshToken: string) => Promise<OAuthTokenInstance>
-}
-export interface OAuthTokenClass {
-  getByRefreshTokenAndPopulateClient: OAuthTokenMethods.GetByRefreshTokenAndPopulateClient
-  getByTokenAndPopulateUser: OAuthTokenMethods.GetByTokenAndPopulateUser
-  getByRefreshTokenAndPopulateUser: OAuthTokenMethods.GetByRefreshTokenAndPopulateUser
-}
-export interface OAuthTokenAttributes {
-  accessToken: string
-  accessTokenExpiresAt: Date
-  refreshToken: string
-  refreshTokenExpiresAt: Date
-  userId?: number
-  oAuthClientId?: number
-  User?: UserModel
-}
-export interface OAuthTokenInstance extends OAuthTokenClass, OAuthTokenAttributes, Sequelize.Instance<OAuthTokenAttributes> {
-  id: number
-  createdAt: Date
-  updatedAt: Date
-}
-export interface OAuthTokenModel extends OAuthTokenClass, Sequelize.Model<OAuthTokenInstance, OAuthTokenAttributes> {}
diff --git a/server/models/oauth/oauth-token.ts b/server/models/oauth/oauth-token.ts
index a82bff130..0d21c42fd 100644
--- a/server/models/oauth/oauth-token.ts
+++ b/server/models/oauth/oauth-token.ts
@@ -1,164 +1,163 @@
-import * as Sequelize from 'sequelize'
+import { AllowNull, BelongsTo, Column, CreatedAt, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript'
 import { logger } from '../../helpers'
+import { AccountModel } from '../account/account'
+import { UserModel } from '../account/user'
+import { OAuthClientModel } from './oauth-client'
+export type OAuthTokenInfo = {
+  refreshToken: string
+  refreshTokenExpiresAt: Date,
+  client: {
+    id: number
+  },
+  user: {
+    id: number
+  }
+}
-import { addMethodsToModel } from '../utils'
+@Table({
-import { OAuthTokenAttributes, OAuthTokenInfo, OAuthTokenInstance, OAuthTokenMethods } from './oauth-token-interface'
+  tableName: 'oAuthToken',
+  indexes: [
-let OAuthToken: Sequelize.Model<OAuthTokenInstance, OAuthTokenAttributes>
-let getByRefreshTokenAndPopulateClient: OAuthTokenMethods.GetByRefreshTokenAndPopulateClient
-let getByTokenAndPopulateUser: OAuthTokenMethods.GetByTokenAndPopulateUser
-let getByRefreshTokenAndPopulateUser: OAuthTokenMethods.GetByRefreshTokenAndPopulateUser
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  OAuthToken = sequelize.define<OAuthTokenInstance, OAuthTokenAttributes>('OAuthToken',
    {
-      accessToken: {
+      fields: [ 'refreshToken' ],
-        type: DataTypes.STRING,
+      unique: true
-        allowNull: false
-      },
-      accessTokenExpiresAt: {
-        type: DataTypes.DATE,
-        allowNull: false
-      },
-      refreshToken: {
-        type: DataTypes.STRING,
-        allowNull: false
-      },
-      refreshTokenExpiresAt: {
-        type: DataTypes.DATE,
-        allowNull: false
-      }
    },
    {
-      indexes: [
+      fields: [ 'accessToken' ],
-        {
+      unique: true
-          fields: [ 'refreshToken' ],
+    },
-          unique: true
+    {
-        },
+      fields: [ 'userId' ]
-        {
+    },
-          fields: [ 'accessToken' ],
+    {
-          unique: true
+      fields: [ 'oAuthClientId' ]
-        },
-        {
-          fields: [ 'userId' ]
-        },
-        {
-          fields: [ 'oAuthClientId' ]
-        }
-      ]
    }
-  )
+  ]
+})
+export class OAuthTokenModel extends Model<OAuthTokenModel> {
-  const classMethods = [
+  @AllowNull(false)
-    associate,
+  @Column
+  accessToken: string
-    getByRefreshTokenAndPopulateClient,
+  @AllowNull(false)
-    getByTokenAndPopulateUser,
+  @Column
-    getByRefreshTokenAndPopulateUser
+  accessTokenExpiresAt: Date
-  ]
-  addMethodsToModel(OAuthToken, classMethods)
-  return OAuthToken
+  @AllowNull(false)
-}
+  @Column
+  refreshToken: string
-// ---------------------------------------------------------------------------
+  @AllowNull(false)
+  @Column
+  refreshTokenExpiresAt: Date
-function associate (models) {
+  @CreatedAt
-  OAuthToken.belongsTo(models.User, {
+  createdAt: Date
+  @UpdatedAt
+  updatedAt: Date
+  @ForeignKey(() => UserModel)
+  @Column
+  userId: number
+  @BelongsTo(() => UserModel, {
    foreignKey: {
-      name: 'userId',
      allowNull: false
    },
    onDelete: 'cascade'
  })
+  User: UserModel
-  OAuthToken.belongsTo(models.OAuthClient, {
+  @ForeignKey(() => OAuthClientModel)
+  @Column
+  oAuthClientId: number
+  @BelongsTo(() => OAuthClientModel, {
    foreignKey: {
-      name: 'oAuthClientId',
      allowNull: false
    },
    onDelete: 'cascade'
  })
-}
+  OAuthClients: OAuthClientModel[]
-getByRefreshTokenAndPopulateClient = function (refreshToken: string) {
+  static getByRefreshTokenAndPopulateClient (refreshToken: string) {
-  const query = {
+    const query = {
-    where: {
+      where: {
-      refreshToken: refreshToken
+        refreshToken: refreshToken
-    },
+      },
-    include: [ OAuthToken['sequelize'].models.OAuthClient ]
+      include: [ OAuthClientModel ]
+    }
+    return OAuthTokenModel.findOne(query)
+      .then(token => {
+        if (!token) return null
+        return {
+          refreshToken: token.refreshToken,
+          refreshTokenExpiresAt: token.refreshTokenExpiresAt,
+          client: {
+            id: token.oAuthClientId
+          },
+          user: {
+            id: token.userId
+          }
+        } as OAuthTokenInfo
+      })
+      .catch(err => {
+        logger.info('getRefreshToken error.', err)
+        throw err
+      })
  }
-  return OAuthToken.findOne(query)
+  static getByTokenAndPopulateUser (bearerToken: string) {
-    .then(token => {
+    const query = {
-      if (!token) return null
+      where: {
+        accessToken: bearerToken
-      const tokenInfos: OAuthTokenInfo = {
+      },
-        refreshToken: token.refreshToken,
+      include: [
-        refreshTokenExpiresAt: token.refreshTokenExpiresAt,
+        {
-        client: {
+          model: UserModel,
-          id: token.oAuthClientId
+          include: [
-        },
+            {
-        user: {
+              model: AccountModel,
-          id: token.userId
+              required: true
+            }
+          ]
        }
-      }
+      ]
+    }
-      return tokenInfos
+    return OAuthTokenModel.findOne(query).then(token => {
-    })
+      if (token) token['user'] = token.User
-    .catch(err => {
-      logger.info('getRefreshToken error.', err)
-      throw err
-    })
-}
-getByTokenAndPopulateUser = function (bearerToken: string) {
+      return token
-  const query = {
+    })
-    where: {
-      accessToken: bearerToken
-    },
-    include: [
-      {
-        model: OAuthToken['sequelize'].models.User,
-        include: [
-          {
-            model: OAuthToken['sequelize'].models.Account,
-            required: true
-          }
-        ]
-      }
-    ]
  }
-  return OAuthToken.findOne(query).then(token => {
+  static getByRefreshTokenAndPopulateUser (refreshToken: string) {
-    if (token) token['user'] = token.User
+    const query = {
+      where: {
+        refreshToken: refreshToken
+      },
+      include: [
+        {
+          model: UserModel,
+          include: [
+            {
+              model: AccountModel,
+              required: true
+            }
+          ]
+        }
+      ]
+    }
-    return token
+    return OAuthTokenModel.findOne(query).then(token => {
-  })
+      token['user'] = token.User
-}
-getByRefreshTokenAndPopulateUser = function (refreshToken: string) {
+      return token
-  const query = {
+    })
-    where: {
-      refreshToken: refreshToken
-    },
-    include: [
-      {
-        model: OAuthToken['sequelize'].models.User,
-        include: [
-          {
-            model: OAuthToken['sequelize'].models.Account,
-            required: true
-          }
-        ]
-      }
-    ]
  }
-  return OAuthToken.findOne(query).then(token => {
-    token['user'] = token.User
-    return token
-  })
 }
diff --git a/server/models/server/index.ts b/server/models/server/index.ts
deleted file mode 100644
index 4cb2994aa..000000000
--- a/server/models/server/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './server-interface'
diff --git a/server/models/server/server-interface.ts b/server/models/server/server-interface.ts
deleted file mode 100644
index be1a4917e..000000000
--- a/server/models/server/server-interface.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import * as Promise from 'bluebird'
-import * as Sequelize from 'sequelize'
-export namespace ServerMethods {
-  export type ListBadServers = () => Promise<ServerInstance[]>
-  export type UpdateServersScoreAndRemoveBadOnes = (goodServers: number[], badServers: number[]) => void
-}
-export interface ServerClass {
-  updateServersScoreAndRemoveBadOnes: ServerMethods.UpdateServersScoreAndRemoveBadOnes
-}
-export interface ServerAttributes {
-  id?: number
-  host?: string
-  score?: number | Sequelize.literal // Sequelize literal for 'score +' + value
-}
-export interface ServerInstance extends ServerClass, ServerAttributes, Sequelize.Instance<ServerAttributes> {
-  createdAt: Date
-  updatedAt: Date
-}
-export interface ServerModel extends ServerClass, Sequelize.Model<ServerInstance, ServerAttributes> {}
diff --git a/server/models/server/server.ts b/server/models/server/server.ts
index ebd216b08..edfd8010b 100644
--- a/server/models/server/server.ts
+++ b/server/models/server/server.ts
@@ -1,124 +1,109 @@
 import * as Sequelize from 'sequelize'
-import { isHostValid, logger } from '../../helpers'
+import { AllowNull, Column, CreatedAt, Default, Is, IsInt, Max, Model, Table, UpdatedAt } from 'sequelize-typescript'
+import { logger } from '../../helpers'
+import { isHostValid } from '../../helpers/custom-validators/servers'
 import { SERVERS_SCORE } from '../../initializers'
-import { addMethodsToModel } from '../utils'
+import { throwIfNotValid } from '../utils'
-import { ServerAttributes, ServerInstance, ServerMethods } from './server-interface'
-let Server: Sequelize.Model<ServerInstance, ServerAttributes>
+@Table({
-let updateServersScoreAndRemoveBadOnes: ServerMethods.UpdateServersScoreAndRemoveBadOnes
+  tableName: 'server',
+  indexes: [
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  Server = sequelize.define<ServerInstance, ServerAttributes>('Server',
    {
-      host: {
+      fields: [ 'host' ],
-        type: DataTypes.STRING,
+      unique: true
-        allowNull: false,
-        validate: {
-          isHost: value => {
-            const res = isHostValid(value)
-            if (res === false) throw new Error('Host not valid.')
-          }
-        }
-      },
-      score: {
-        type: DataTypes.INTEGER,
-        defaultValue: SERVERS_SCORE.BASE,
-        allowNull: false,
-        validate: {
-          isInt: true,
-          max: SERVERS_SCORE.MAX
-        }
-      }
    },
    {
-      indexes: [
+      fields: [ 'score' ]
-        {
-          fields: [ 'host' ],
-          unique: true
-        },
-        {
-          fields: [ 'score' ]
-        }
-      ]
    }
-  )
-  const classMethods = [
-    updateServersScoreAndRemoveBadOnes
  ]
-  addMethodsToModel(Server, classMethods)
+})
+export class ServerModel extends Model<ServerModel> {
-  return Server
-}
+  @AllowNull(false)
+  @Is('Host', value => throwIfNotValid(value, isHostValid, 'valid host'))
-// ------------------------------ Statics ------------------------------
+  @Column
+  host: string
-updateServersScoreAndRemoveBadOnes = function (goodServers: number[], badServers: number[]) {
-  logger.info('Updating %d good servers and %d bad servers scores.', goodServers.length, badServers.length)
+  @AllowNull(false)
+  @Default(SERVERS_SCORE.BASE)
+  @IsInt
+  @Max(SERVERS_SCORE.MAX)
+  @Column
+  score: number
+  @CreatedAt
+  createdAt: Date
+  @UpdatedAt
+  updatedAt: Date
+  static updateServersScoreAndRemoveBadOnes (goodServers: number[], badServers: number[]) {
+    logger.info('Updating %d good servers and %d bad servers scores.', goodServers.length, badServers.length)
+    if (goodServers.length !== 0) {
+      ServerModel.incrementScores(goodServers, SERVERS_SCORE.BONUS)
+        .catch(err => {
+          logger.error('Cannot increment scores of good servers.', err)
+        })
+    }
-  if (goodServers.length !== 0) {
+    if (badServers.length !== 0) {
-    incrementScores(goodServers, SERVERS_SCORE.BONUS).catch(err => {
+      ServerModel.incrementScores(badServers, SERVERS_SCORE.PENALTY)
-      logger.error('Cannot increment scores of good servers.', err)
+        .then(() => ServerModel.removeBadServers())
-    })
+        .catch(err => {
-  }
+          if (err) logger.error('Cannot decrement scores of bad servers.', err)
+        })
-  if (badServers.length !== 0) {
+    }
-    incrementScores(badServers, SERVERS_SCORE.PENALTY)
-      .then(() => removeBadServers())
-      .catch(err => {
-        if (err) logger.error('Cannot decrement scores of bad servers.', err)
-      })
  }
-}
-// ---------------------------------------------------------------------------
-// Remove servers with a score of 0 (too many requests where they were unreachable)
+  // Remove servers with a score of 0 (too many requests where they were unreachable)
-async function removeBadServers () {
+  private static async removeBadServers () {
-  try {
+    try {
-    const servers = await listBadServers()
+      const servers = await ServerModel.listBadServers()
-    const serversRemovePromises = servers.map(server => server.destroy())
+      const serversRemovePromises = servers.map(server => server.destroy())
-    await Promise.all(serversRemovePromises)
+      await Promise.all(serversRemovePromises)
-    const numberOfServersRemoved = servers.length
+      const numberOfServersRemoved = servers.length
-    if (numberOfServersRemoved) {
+      if (numberOfServersRemoved) {
-      logger.info('Removed %d servers.', numberOfServersRemoved)
+        logger.info('Removed %d servers.', numberOfServersRemoved)
-    } else {
+      } else {
-      logger.info('No need to remove bad servers.')
+        logger.info('No need to remove bad servers.')
+      }
+    } catch (err) {
+      logger.error('Cannot remove bad servers.', err)
    }
-  } catch (err) {
-    logger.error('Cannot remove bad servers.', err)
  }
-}
-function incrementScores (ids: number[], value: number) {
+  private static incrementScores (ids: number[], value: number) {
-  const update = {
+    const update = {
-    score: Sequelize.literal('score +' + value)
+      score: Sequelize.literal('score +' + value)
-  }
+    }
-  const options = {
+    const options = {
-    where: {
+      where: {
-      id: {
+        id: {
-        [Sequelize.Op.in]: ids
+          [Sequelize.Op.in]: ids
-      }
+        }
-    },
+      },
-    // In this case score is a literal and not an integer so we do not validate it
+      // In this case score is a literal and not an integer so we do not validate it
-    validate: false
+      validate: false
-  }
+    }
-  return Server.update(update, options)
+    return ServerModel.update(update, options)
-}
+  }
-function listBadServers () {
+  private static listBadServers () {
-  const query = {
+    const query = {
-    where: {
+      where: {
-      score: {
+        score: {
-        [Sequelize.Op.lte]: 0
+          [Sequelize.Op.lte]: 0
+        }
      }
    }
-  }
-  return Server.findAll(query)
+    return ServerModel.findAll(query)
+  }
 }
diff --git a/server/models/utils.ts b/server/models/utils.ts
index 1bf61d2a6..1606453e0 100644
--- a/server/models/utils.ts
+++ b/server/models/utils.ts
@@ -14,22 +14,23 @@ function getSort (value: string) {
  return [ field, direction ]
 }
-function addMethodsToModel (model: any, classMethods: Function[], instanceMethods: Function[] = []) {
-  classMethods.forEach(m => model[m.name] = m)
-  instanceMethods.forEach(m => model.prototype[m.name] = m)
-}
 function getSortOnModel (model: any, value: string) {
  let sort = getSort(value)
-  if (model) return [ { model: model }, sort[0], sort[1] ]
+  if (model) return [ model, sort[0], sort[1] ]
  return sort
 }
+function throwIfNotValid (value: any, validator: (value: any) => boolean, fieldName = 'value') {
+  if (validator(value) === false) {
+    throw new Error(`"${value}" is not a valid ${fieldName}.`)
+  }
+}
 // ---------------------------------------------------------------------------
 export {
-  addMethodsToModel,
  getSort,
-  getSortOnModel
+  getSortOnModel,
+  throwIfNotValid
 }
diff --git a/server/models/video/index.ts b/server/models/video/index.ts
deleted file mode 100644
index e17bbfab4..000000000
--- a/server/models/video/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export * from './tag-interface'
-export * from './video-abuse-interface'
-export * from './video-blacklist-interface'
-export * from './video-channel-interface'
-export * from './video-tag-interface'
-export * from './video-file-interface'
-export * from './video-interface'
-export * from './video-share-interface'
-export * from './video-channel-share-interface'
diff --git a/server/models/video/tag-interface.ts b/server/models/video/tag-interface.ts
deleted file mode 100644
index 08e5c3246..000000000
--- a/server/models/video/tag-interface.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
-export namespace TagMethods {
-  export type FindOrCreateTags = (tags: string[], transaction: Sequelize.Transaction) => Promise<TagInstance[]>
-}
-export interface TagClass {
-  findOrCreateTags: TagMethods.FindOrCreateTags
-}
-export interface TagAttributes {
-  name: string
-}
-export interface TagInstance extends TagClass, TagAttributes, Sequelize.Instance<TagAttributes> {
-  id: number
-}
-export interface TagModel extends TagClass, Sequelize.Model<TagInstance, TagAttributes> {}
diff --git a/server/models/video/tag.ts b/server/models/video/tag.ts
index 0c0757fc8..0ae74d808 100644
--- a/server/models/video/tag.ts
+++ b/server/models/video/tag.ts
@@ -1,73 +1,60 @@
-import * as Sequelize from 'sequelize'
+import * as Bluebird from 'bluebird'
-import * as Promise from 'bluebird'
+import { Transaction } from 'sequelize'
+import { AllowNull, BelongsToMany, Column, CreatedAt, Is, Model, Table, UpdatedAt } from 'sequelize-typescript'
-import { addMethodsToModel } from '../utils'
+import { isVideoTagValid } from '../../helpers/custom-validators/videos'
-import {
+import { throwIfNotValid } from '../utils'
-  TagInstance,
+import { VideoModel } from './video'
-  TagAttributes,
+import { VideoTagModel } from './video-tag'
-  TagMethods
+@Table({
-} from './tag-interface'
+  tableName: 'tag',
+  timestamps: false,
-let Tag: Sequelize.Model<TagInstance, TagAttributes>
+  indexes: [
-let findOrCreateTags: TagMethods.FindOrCreateTags
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  Tag = sequelize.define<TagInstance, TagAttributes>('Tag',
    {
-      name: {
+      fields: [ 'name' ],
-        type: DataTypes.STRING,
+      unique: true
-        allowNull: false
-      }
-    },
-    {
-      timestamps: false,
-      indexes: [
-        {
-          fields: [ 'name' ],
-          unique: true
-        }
-      ]
    }
-  )
-  const classMethods = [
-    associate,
-    findOrCreateTags
  ]
-  addMethodsToModel(Tag, classMethods)
+})
+export class TagModel extends Model<TagModel> {
-  return Tag
+  @AllowNull(false)
-}
+  @Is('VideoTag', value => throwIfNotValid(value, isVideoTagValid, 'tag'))
+  @Column
+  name: string
-// ---------------------------------------------------------------------------
+  @CreatedAt
+  createdAt: Date
-function associate (models) {
+  @UpdatedAt
-  Tag.belongsToMany(models.Video, {
+  updatedAt: Date
+  @BelongsToMany(() => VideoModel, {
    foreignKey: 'tagId',
-    through: models.VideoTag,
+    through: () => VideoTagModel,
    onDelete: 'CASCADE'
  })
-}
+  Videos: VideoModel[]
-findOrCreateTags = function (tags: string[], transaction: Sequelize.Transaction) {
+  static findOrCreateTags (tags: string[], transaction: Transaction) {
-  const tasks: Promise<TagInstance>[] = []
+    const tasks: Bluebird<TagModel>[] = []
-  tags.forEach(tag => {
+    tags.forEach(tag => {
-    const query: Sequelize.FindOrInitializeOptions<TagAttributes> = {
+      const query = {
-      where: {
+        where: {
-        name: tag
+          name: tag
-      },
+        },
-      defaults: {
+        defaults: {
-        name: tag
+          name: tag
+        }
      }
-    }
-    if (transaction) query.transaction = transaction
+      if (transaction) query['transaction'] = transaction
-    const promise = Tag.findOrCreate(query).then(([ tagInstance ]) => tagInstance)
+      const promise = TagModel.findOrCreate(query)
-    tasks.push(promise)
+        .then(([ tagInstance ]) => tagInstance)
-  })
+      tasks.push(promise)
+    })
-  return Promise.all(tasks)
+    return Promise.all(tasks)
+  }
 }
diff --git a/server/models/video/video-abuse-interface.ts b/server/models/video/video-abuse-interface.ts
deleted file mode 100644
index feafc4a19..000000000
--- a/server/models/video/video-abuse-interface.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import * as Promise from 'bluebird'
-import * as Sequelize from 'sequelize'
-import { ResultList } from '../../../shared'
-import { VideoAbuse as FormattedVideoAbuse } from '../../../shared/models/videos/video-abuse.model'
-import { AccountInstance } from '../account/account-interface'
-import { ServerInstance } from '../server/server-interface'
-import { VideoInstance } from './video-interface'
-import { VideoAbuseObject } from '../../../shared/models/activitypub/objects/video-abuse-object'
-export namespace VideoAbuseMethods {
-  export type ToFormattedJSON = (this: VideoAbuseInstance) => FormattedVideoAbuse
-  export type ListForApi = (start: number, count: number, sort: string) => Promise< ResultList<VideoAbuseInstance> >
-  export type ToActivityPubObject = () => VideoAbuseObject
-}
-export interface VideoAbuseClass {
-  listForApi: VideoAbuseMethods.ListForApi
-  toActivityPubObject: VideoAbuseMethods.ToActivityPubObject
-}
-export interface VideoAbuseAttributes {
-  reason: string
-  videoId: number
-  reporterAccountId: number
-  Account?: AccountInstance
-  Video?: VideoInstance
-}
-export interface VideoAbuseInstance extends VideoAbuseClass, VideoAbuseAttributes, Sequelize.Instance<VideoAbuseAttributes> {
-  id: number
-  createdAt: Date
-  updatedAt: Date
-  Server: ServerInstance
-  toFormattedJSON: VideoAbuseMethods.ToFormattedJSON
-}
-export interface VideoAbuseModel extends VideoAbuseClass, Sequelize.Model<VideoAbuseInstance, VideoAbuseAttributes> {}
diff --git a/server/models/video/video-abuse.ts b/server/models/video/video-abuse.ts
index d09f5f7a1..d0ee969fb 100644
--- a/server/models/video/video-abuse.ts
+++ b/server/models/video/video-abuse.ts
@@ -1,142 +1,116 @@
-import * as Sequelize from 'sequelize'
+import { AllowNull, BelongsTo, Column, CreatedAt, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript'
+import { VideoAbuseObject } from '../../../shared/models/activitypub/objects'
+import { isVideoAbuseReasonValid } from '../../helpers/custom-validators/videos'
 import { CONFIG } from '../../initializers'
-import { isVideoAbuseReasonValid } from '../../helpers'
+import { AccountModel } from '../account/account'
+import { ServerModel } from '../server/server'
-import { addMethodsToModel, getSort } from '../utils'
+import { getSort, throwIfNotValid } from '../utils'
-import {
+import { VideoModel } from './video'
-  VideoAbuseInstance,
-  VideoAbuseAttributes,
+@Table({
+  tableName: 'videoAbuse',
-  VideoAbuseMethods
+  indexes: [
-} from './video-abuse-interface'
-import { VideoAbuseObject } from '../../../shared/models/activitypub/objects/video-abuse-object'
-let VideoAbuse: Sequelize.Model<VideoAbuseInstance, VideoAbuseAttributes>
-let toFormattedJSON: VideoAbuseMethods.ToFormattedJSON
-let listForApi: VideoAbuseMethods.ListForApi
-let toActivityPubObject: VideoAbuseMethods.ToActivityPubObject
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  VideoAbuse = sequelize.define<VideoAbuseInstance, VideoAbuseAttributes>('VideoAbuse',
    {
-      reason: {
+      fields: [ 'videoId' ]
-        type: DataTypes.STRING,
-        allowNull: false,
-        validate: {
-          reasonValid: value => {
-            const res = isVideoAbuseReasonValid(value)
-            if (res === false) throw new Error('Video abuse reason is not valid.')
-          }
-        }
-      }
    },
    {
-      indexes: [
+      fields: [ 'reporterAccountId' ]
-        {
-          fields: [ 'videoId' ]
-        },
-        {
-          fields: [ 'reporterAccountId' ]
-        }
-      ]
    }
-  )
-  const classMethods = [
-    associate,
-    listForApi
-  ]
-  const instanceMethods = [
-    toFormattedJSON,
-    toActivityPubObject
  ]
-  addMethodsToModel(VideoAbuse, classMethods, instanceMethods)
+})
+export class VideoAbuseModel extends Model<VideoAbuseModel> {
-  return VideoAbuse
-}
-// ------------------------------ METHODS ------------------------------
-toFormattedJSON = function (this: VideoAbuseInstance) {
-  let reporterServerHost
-  if (this.Account.Server) {
-    reporterServerHost = this.Account.Server.host
-  } else {
-    // It means it's our video
-    reporterServerHost = CONFIG.WEBSERVER.HOST
-  }
-  const json = {
-    id: this.id,
-    reason: this.reason,
-    reporterUsername: this.Account.name,
-    reporterServerHost,
-    videoId: this.Video.id,
-    videoUUID: this.Video.uuid,
-    videoName: this.Video.name,
-    createdAt: this.createdAt
-  }
-  return json
+  @AllowNull(false)
-}
+  @Is('VideoAbuseReason', value => throwIfNotValid(value, isVideoAbuseReasonValid, 'reason'))
+  @Column
+  reason: string
-toActivityPubObject = function (this: VideoAbuseInstance) {
+  @CreatedAt
-  const videoAbuseObject: VideoAbuseObject = {
+  createdAt: Date
-    type: 'Flag' as 'Flag',
-    content: this.reason,
-    object: this.Video.url
-  }
-  return videoAbuseObject
+  @UpdatedAt
-}
+  updatedAt: Date
-// ------------------------------ STATICS ------------------------------
+  @ForeignKey(() => AccountModel)
+  @Column
+  reporterAccountId: number
-function associate (models) {
+  @BelongsTo(() => AccountModel, {
-  VideoAbuse.belongsTo(models.Account, {
    foreignKey: {
-      name: 'reporterAccountId',
      allowNull: false
    },
-    onDelete: 'CASCADE'
+    onDelete: 'cascade'
  })
+  Account: AccountModel
+  @ForeignKey(() => VideoModel)
+  @Column
+  videoId: number
-  VideoAbuse.belongsTo(models.Video, {
+  @BelongsTo(() => VideoModel, {
    foreignKey: {
-      name: 'videoId',
      allowNull: false
    },
-    onDelete: 'CASCADE'
+    onDelete: 'cascade'
  })
-}
+  Video: VideoModel
+  static listForApi (start: number, count: number, sort: string) {
+    const query = {
+      offset: start,
+      limit: count,
+      order: [ getSort(sort) ],
+      include: [
+        {
+          model: AccountModel,
+          required: true,
+          include: [
+            {
+              model: ServerModel,
+              required: false
+            }
+          ]
+        },
+        {
+          model: VideoModel,
+          required: true
+        }
+      ]
+    }
-listForApi = function (start: number, count: number, sort: string) {
+    return VideoAbuseModel.findAndCountAll(query)
-  const query = {
+      .then(({ rows, count }) => {
-    offset: start,
+        return { total: count, data: rows }
-    limit: count,
+      })
-    order: [ getSort(sort) ],
-    include: [
-      {
-        model: VideoAbuse['sequelize'].models.Account,
-        required: true,
-        include: [
-          {
-            model: VideoAbuse['sequelize'].models.Server,
-            required: false
-          }
-        ]
-      },
-      {
-        model: VideoAbuse['sequelize'].models.Video,
-        required: true
-      }
-    ]
  }
-  return VideoAbuse.findAndCountAll(query).then(({ rows, count }) => {
+  toFormattedJSON () {
-    return { total: count, data: rows }
+    let reporterServerHost
-  })
+    if (this.Account.Server) {
+      reporterServerHost = this.Account.Server.host
+    } else {
+      // It means it's our video
+      reporterServerHost = CONFIG.WEBSERVER.HOST
+    }
+    return {
+      id: this.id,
+      reason: this.reason,
+      reporterUsername: this.Account.name,
+      reporterServerHost,
+      videoId: this.Video.id,
+      videoUUID: this.Video.uuid,
+      videoName: this.Video.name,
+      createdAt: this.createdAt
+    }
+  }
+  toActivityPubObject (): VideoAbuseObject {
+    return {
+      type: 'Flag' as 'Flag',
+      content: this.reason,
+      object: this.Video.url
+    }
+  }
 }
diff --git a/server/models/video/video-blacklist-interface.ts b/server/models/video/video-blacklist-interface.ts
deleted file mode 100644
index be2483d4c..000000000
--- a/server/models/video/video-blacklist-interface.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
-import { SortType } from '../../helpers'
-import { ResultList } from '../../../shared'
-import { VideoInstance } from './video-interface'
-// Don't use barrel, import just what we need
-import { BlacklistedVideo as FormattedBlacklistedVideo } from '../../../shared/models/videos/video-blacklist.model'
-export namespace BlacklistedVideoMethods {
-  export type ToFormattedJSON = (this: BlacklistedVideoInstance) => FormattedBlacklistedVideo
-  export type ListForApi = (start: number, count: number, sort: SortType) => Promise< ResultList<BlacklistedVideoInstance> >
-  export type LoadByVideoId = (id: number) => Promise<BlacklistedVideoInstance>
-}
-export interface BlacklistedVideoClass {
-  toFormattedJSON: BlacklistedVideoMethods.ToFormattedJSON
-  listForApi: BlacklistedVideoMethods.ListForApi
-  loadByVideoId: BlacklistedVideoMethods.LoadByVideoId
-}
-export interface BlacklistedVideoAttributes {
-  videoId: number
-  Video?: VideoInstance
-}
-export interface BlacklistedVideoInstance
-  extends BlacklistedVideoClass, BlacklistedVideoAttributes, Sequelize.Instance<BlacklistedVideoAttributes> {
-  id: number
-  createdAt: Date
-  updatedAt: Date
-  toFormattedJSON: BlacklistedVideoMethods.ToFormattedJSON
-}
-export interface BlacklistedVideoModel
-  extends BlacklistedVideoClass, Sequelize.Model<BlacklistedVideoInstance, BlacklistedVideoAttributes> {}
diff --git a/server/models/video/video-blacklist.ts b/server/models/video/video-blacklist.ts
index ae8286285..6db562719 100644
--- a/server/models/video/video-blacklist.ts
+++ b/server/models/video/video-blacklist.ts
@@ -1,104 +1,80 @@
-import * as Sequelize from 'sequelize'
+import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript'
 import { SortType } from '../../helpers'
-import { addMethodsToModel, getSortOnModel } from '../utils'
+import { getSortOnModel } from '../utils'
-import { VideoInstance } from './video-interface'
+import { VideoModel } from './video'
-import {
-  BlacklistedVideoInstance,
-  BlacklistedVideoAttributes,
-  BlacklistedVideoMethods
-} from './video-blacklist-interface'
-let BlacklistedVideo: Sequelize.Model<BlacklistedVideoInstance, BlacklistedVideoAttributes>
-let toFormattedJSON: BlacklistedVideoMethods.ToFormattedJSON
-let listForApi: BlacklistedVideoMethods.ListForApi
-let loadByVideoId: BlacklistedVideoMethods.LoadByVideoId
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
+@Table({
-  BlacklistedVideo = sequelize.define<BlacklistedVideoInstance, BlacklistedVideoAttributes>('BlacklistedVideo',
+  tableName: 'videoBlacklist',
-    {},
+  indexes: [
    {
-      indexes: [
+      fields: [ 'videoId' ],
-        {
+      unique: true
-          fields: [ 'videoId' ],
-          unique: true
-        }
-      ]
    }
-  )
-  const classMethods = [
-    associate,
-    listForApi,
-    loadByVideoId
  ]
-  const instanceMethods = [
+})
-    toFormattedJSON
+export class VideoBlacklistModel extends Model<VideoBlacklistModel> {
-  ]
-  addMethodsToModel(BlacklistedVideo, classMethods, instanceMethods)
-  return BlacklistedVideo
-}
-// ------------------------------ METHODS ------------------------------
+  @CreatedAt
+  createdAt: Date
-toFormattedJSON = function (this: BlacklistedVideoInstance) {
+  @UpdatedAt
-  let video: VideoInstance
+  updatedAt: Date
-  video = this.Video
-  return {
-    id: this.id,
-    videoId: this.videoId,
-    createdAt: this.createdAt,
-    updatedAt: this.updatedAt,
-    name: video.name,
-    uuid: video.uuid,
-    description: video.description,
-    duration: video.duration,
-    views: video.views,
-    likes: video.likes,
-    dislikes: video.dislikes,
-    nsfw: video.nsfw
-  }
-}
-// ------------------------------ STATICS ------------------------------
+  @ForeignKey(() => VideoModel)
+  @Column
+  videoId: number
-function associate (models) {
+  @BelongsTo(() => VideoModel, {
-  BlacklistedVideo.belongsTo(models.Video, {
    foreignKey: {
-      name: 'videoId',
      allowNull: false
    },
-    onDelete: 'CASCADE'
+    onDelete: 'cascade'
  })
-}
+  Video: VideoModel
+  static listForApi (start: number, count: number, sort: SortType) {
+    const query = {
+      offset: start,
+      limit: count,
+      order: [ getSortOnModel(sort.sortModel, sort.sortValue) ],
+      include: [ { model: VideoModel } ]
+    }
-listForApi = function (start: number, count: number, sort: SortType) {
+    return VideoBlacklistModel.findAndCountAll(query)
-  const query = {
+      .then(({ rows, count }) => {
-    offset: start,
+        return {
-    limit: count,
+          data: rows,
-    order: [ getSortOnModel(sort.sortModel, sort.sortValue) ],
+          total: count
-    include: [ { model: BlacklistedVideo['sequelize'].models.Video } ]
+        }
+      })
  }
-  return BlacklistedVideo.findAndCountAll(query).then(({ rows, count }) => {
+  static loadByVideoId (id: number) {
-    return {
+    const query = {
-      data: rows,
+      where: {
-      total: count
+        videoId: id
+      }
    }
-  })
-}
-loadByVideoId = function (id: number) {
+    return VideoBlacklistModel.findOne(query)
-  const query = {
-    where: {
-      videoId: id
-    }
  }
-  return BlacklistedVideo.findOne(query)
+  toFormattedJSON () {
+    const video = this.Video
+    return {
+      id: this.id,
+      videoId: this.videoId,
+      createdAt: this.createdAt,
+      updatedAt: this.updatedAt,
+      name: video.name,
+      uuid: video.uuid,
+      description: video.description,
+      duration: video.duration,
+      views: video.views,
+      likes: video.likes,
+      dislikes: video.dislikes,
+      nsfw: video.nsfw
+    }
+  }
 }
diff --git a/server/models/video/video-channel-interface.ts b/server/models/video/video-channel-interface.ts
deleted file mode 100644
index 21f81e901..000000000
--- a/server/models/video/video-channel-interface.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import * as Promise from 'bluebird'
-import * as Sequelize from 'sequelize'
-import { ResultList } from '../../../shared'
-import { VideoChannelObject } from '../../../shared/models/activitypub/objects/video-channel-object'
-import { VideoChannel as FormattedVideoChannel } from '../../../shared/models/videos/video-channel.model'
-import { AccountInstance } from '../account/account-interface'
-import { VideoInstance } from './video-interface'
-import { VideoChannelShareInstance } from './video-channel-share-interface'
-export namespace VideoChannelMethods {
-  export type ToFormattedJSON = (this: VideoChannelInstance) => FormattedVideoChannel
-  export type ToActivityPubObject = (this: VideoChannelInstance) => VideoChannelObject
-  export type IsOwned = (this: VideoChannelInstance) => boolean
-  export type CountByAccount = (accountId: number) => Promise<number>
-  export type ListForApi = (start: number, count: number, sort: string) => Promise< ResultList<VideoChannelInstance> >
-  export type LoadByIdAndAccount = (id: number, accountId: number) => Promise<VideoChannelInstance>
-  export type ListByAccount = (accountId: number) => Promise< ResultList<VideoChannelInstance> >
-  export type LoadAndPopulateAccount = (id: number) => Promise<VideoChannelInstance>
-  export type LoadByUUIDAndPopulateAccount = (uuid: string) => Promise<VideoChannelInstance>
-  export type LoadByUUID = (uuid: string, t?: Sequelize.Transaction) => Promise<VideoChannelInstance>
-  export type LoadByHostAndUUID = (uuid: string, serverHost: string, t?: Sequelize.Transaction) => Promise<VideoChannelInstance>
-  export type LoadAndPopulateAccountAndVideos = (id: number) => Promise<VideoChannelInstance>
-  export type LoadByUrl = (uuid: string, t?: Sequelize.Transaction) => Promise<VideoChannelInstance>
-  export type LoadByUUIDOrUrl = (uuid: string, url: string, t?: Sequelize.Transaction) => Promise<VideoChannelInstance>
-}
-export interface VideoChannelClass {
-  countByAccount: VideoChannelMethods.CountByAccount
-  listForApi: VideoChannelMethods.ListForApi
-  listByAccount: VideoChannelMethods.ListByAccount
-  loadByIdAndAccount: VideoChannelMethods.LoadByIdAndAccount
-  loadAndPopulateAccount: VideoChannelMethods.LoadAndPopulateAccount
-  loadByUUIDAndPopulateAccount: VideoChannelMethods.LoadByUUIDAndPopulateAccount
-  loadAndPopulateAccountAndVideos: VideoChannelMethods.LoadAndPopulateAccountAndVideos
-  loadByUrl: VideoChannelMethods.LoadByUrl
-  loadByUUIDOrUrl: VideoChannelMethods.LoadByUUIDOrUrl
-}
-export interface VideoChannelAttributes {
-  id?: number
-  uuid?: string
-  name: string
-  description: string
-  remote: boolean
-  url?: string
-  Account?: AccountInstance
-  Videos?: VideoInstance[]
-  VideoChannelShares?: VideoChannelShareInstance[]
-}
-export interface VideoChannelInstance extends VideoChannelClass, VideoChannelAttributes, Sequelize.Instance<VideoChannelAttributes> {
-  id: number
-  createdAt: Date
-  updatedAt: Date
-  isOwned: VideoChannelMethods.IsOwned
-  toFormattedJSON: VideoChannelMethods.ToFormattedJSON
-  toActivityPubObject: VideoChannelMethods.ToActivityPubObject
-}
-export interface VideoChannelModel extends VideoChannelClass, Sequelize.Model<VideoChannelInstance, VideoChannelAttributes> {}
diff --git a/server/models/video/video-channel-share-interface.ts b/server/models/video/video-channel-share-interface.ts
deleted file mode 100644
index 2fff41a1b..000000000
--- a/server/models/video/video-channel-share-interface.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import * as Bluebird from 'bluebird'
-import * as Sequelize from 'sequelize'
-import { AccountInstance } from '../account/account-interface'
-import { VideoChannelInstance } from './video-channel-interface'
-export namespace VideoChannelShareMethods {
-  export type LoadAccountsByShare = (videoChannelId: number, t: Sequelize.Transaction) => Bluebird<AccountInstance[]>
-  export type Load = (accountId: number, videoId: number, t: Sequelize.Transaction) => Bluebird<VideoChannelShareInstance>
-}
-export interface VideoChannelShareClass {
-  loadAccountsByShare: VideoChannelShareMethods.LoadAccountsByShare
-  load: VideoChannelShareMethods.Load
-}
-export interface VideoChannelShareAttributes {
-  accountId: number
-  videoChannelId: number
-}
-export interface VideoChannelShareInstance
-  extends VideoChannelShareClass, VideoChannelShareAttributes, Sequelize.Instance<VideoChannelShareAttributes> {
-  id: number
-  createdAt: Date
-  updatedAt: Date
-  Account?: AccountInstance
-  VideoChannel?: VideoChannelInstance
-}
-export interface VideoChannelShareModel
-  extends VideoChannelShareClass, Sequelize.Model<VideoChannelShareInstance, VideoChannelShareAttributes> {}
diff --git a/server/models/video/video-channel-share.ts b/server/models/video/video-channel-share.ts
index 2e9b658a3..cdba32fcd 100644
--- a/server/models/video/video-channel-share.ts
+++ b/server/models/video/video-channel-share.ts
@@ -1,85 +1,79 @@
 import * as Sequelize from 'sequelize'
+import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript'
+import { AccountModel } from '../account/account'
+import { VideoChannelModel } from './video-channel'
-import { addMethodsToModel } from '../utils'
+@Table({
-import { VideoChannelShareAttributes, VideoChannelShareInstance, VideoChannelShareMethods } from './video-channel-share-interface'
+  tableName: 'videoChannelShare',
+  indexes: [
-let VideoChannelShare: Sequelize.Model<VideoChannelShareInstance, VideoChannelShareAttributes>
-let loadAccountsByShare: VideoChannelShareMethods.LoadAccountsByShare
-let load: VideoChannelShareMethods.Load
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  VideoChannelShare = sequelize.define<VideoChannelShareInstance, VideoChannelShareAttributes>('VideoChannelShare',
-    { },
    {
-      indexes: [
+      fields: [ 'accountId' ]
-        {
+    },
-          fields: [ 'accountId' ]
+    {
-        },
+      fields: [ 'videoChannelId' ]
-        {
-          fields: [ 'videoChannelId' ]
-        }
-      ]
    }
-  )
-  const classMethods = [
-    associate,
-    load,
-    loadAccountsByShare
  ]
-  addMethodsToModel(VideoChannelShare, classMethods)
+})
+export class VideoChannelShareModel extends Model<VideoChannelShareModel> {
+  @CreatedAt
+  createdAt: Date
-  return VideoChannelShare
+  @UpdatedAt
-}
+  updatedAt: Date
-// ------------------------------ METHODS ------------------------------
+  @ForeignKey(() => AccountModel)
+  @Column
+  accountId: number
-function associate (models) {
+  @BelongsTo(() => AccountModel, {
-  VideoChannelShare.belongsTo(models.Account, {
    foreignKey: {
-      name: 'accountId',
      allowNull: false
    },
    onDelete: 'cascade'
  })
+  Account: AccountModel
-  VideoChannelShare.belongsTo(models.VideoChannel, {
+  @ForeignKey(() => VideoChannelModel)
+  @Column
+  videoChannelId: number
+  @BelongsTo(() => VideoChannelModel, {
    foreignKey: {
-      name: 'videoChannelId',
+      allowNull: false
-      allowNull: true
    },
    onDelete: 'cascade'
  })
-}
+  VideoChannel: VideoChannelModel
-load = function (accountId: number, videoChannelId: number, t: Sequelize.Transaction) {
-  return VideoChannelShare.findOne({
-    where: {
-      accountId,
-      videoChannelId
-    },
-    include: [
-      VideoChannelShare['sequelize'].models.Account,
-      VideoChannelShare['sequelize'].models.VideoChannel
-    ],
-    transaction: t
-  })
-}
-loadAccountsByShare = function (videoChannelId: number, t: Sequelize.Transaction) {
+  static load (accountId: number, videoChannelId: number, t: Sequelize.Transaction) {
-  const query = {
+    return VideoChannelShareModel.findOne({
-    where: {
+      where: {
-      videoChannelId
+        accountId,
-    },
+        videoChannelId
-    include: [
+      },
-      {
+      include: [
-        model: VideoChannelShare['sequelize'].models.Account,
+        AccountModel,
-        required: true
+        VideoChannelModel
-      }
+      ],
-    ],
+      transaction: t
-    transaction: t
+    })
  }
-  return VideoChannelShare.findAll(query)
+  static loadAccountsByShare (videoChannelId: number, t: Sequelize.Transaction) {
-    .then(res => res.map(r => r.Account))
+    const query = {
+      where: {
+        videoChannelId
+      },
+      include: [
+        {
+          model: AccountModel,
+          required: true
+        }
+      ],
+      transaction: t
+    }
+    return VideoChannelShareModel.findAll(query)
+      .then(res => res.map(r => r.Account))
+  }
 }
diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts
index 54f12dce3..9b545a4ef 100644
--- a/server/models/video/video-channel.ts
+++ b/server/models/video/video-channel.ts
@@ -1,371 +1,341 @@
 import * as Sequelize from 'sequelize'
-import { isVideoChannelDescriptionValid, isVideoChannelNameValid } from '../../helpers'
+import {
-import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
+  AfterDestroy,
-import { sendDeleteVideoChannel } from '../../lib/activitypub/send/send-delete'
+  AllowNull,
+  BelongsTo,
-import { addMethodsToModel, getSort } from '../utils'
+  Column,
-import { VideoChannelAttributes, VideoChannelInstance, VideoChannelMethods } from './video-channel-interface'
+  CreatedAt,
-import { getAnnounceActivityPubUrl } from '../../lib/activitypub/url'
+  DataType,
-import { activityPubCollection } from '../../helpers/activitypub'
+  Default,
-import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
+  ForeignKey,
+  HasMany,
-let VideoChannel: Sequelize.Model<VideoChannelInstance, VideoChannelAttributes>
+  Is,
-let toFormattedJSON: VideoChannelMethods.ToFormattedJSON
+  IsUUID,
-let toActivityPubObject: VideoChannelMethods.ToActivityPubObject
+  Model,
-let isOwned: VideoChannelMethods.IsOwned
+  Table,
-let countByAccount: VideoChannelMethods.CountByAccount
+  UpdatedAt
-let listForApi: VideoChannelMethods.ListForApi
+} from 'sequelize-typescript'
-let listByAccount: VideoChannelMethods.ListByAccount
+import { IFindOptions } from 'sequelize-typescript/lib/interfaces/IFindOptions'
-let loadByIdAndAccount: VideoChannelMethods.LoadByIdAndAccount
+import { activityPubCollection } from '../../helpers'
-let loadByUUID: VideoChannelMethods.LoadByUUID
+import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub'
-let loadAndPopulateAccount: VideoChannelMethods.LoadAndPopulateAccount
+import { isVideoChannelDescriptionValid, isVideoChannelNameValid } from '../../helpers/custom-validators/video-channels'
-let loadByUUIDAndPopulateAccount: VideoChannelMethods.LoadByUUIDAndPopulateAccount
+import { CONSTRAINTS_FIELDS } from '../../initializers'
-let loadByHostAndUUID: VideoChannelMethods.LoadByHostAndUUID
+import { getAnnounceActivityPubUrl } from '../../lib/activitypub'
-let loadAndPopulateAccountAndVideos: VideoChannelMethods.LoadAndPopulateAccountAndVideos
+import { sendDeleteVideoChannel } from '../../lib/activitypub/send'
-let loadByUrl: VideoChannelMethods.LoadByUrl
+import { AccountModel } from '../account/account'
-let loadByUUIDOrUrl: VideoChannelMethods.LoadByUUIDOrUrl
+import { ServerModel } from '../server/server'
+import { getSort, throwIfNotValid } from '../utils'
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
+import { VideoModel } from './video'
-  VideoChannel = sequelize.define<VideoChannelInstance, VideoChannelAttributes>('VideoChannel',
+import { VideoChannelShareModel } from './video-channel-share'
+@Table({
+  tableName: 'videoChannel',
+  indexes: [
    {
-      uuid: {
+      fields: [ 'accountId' ]
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
-        allowNull: false,
-        validate: {
-          isUUID: 4
-        }
-      },
-      name: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        validate: {
-          nameValid: value => {
-            const res = isVideoChannelNameValid(value)
-            if (res === false) throw new Error('Video channel name is not valid.')
-          }
-        }
-      },
-      description: {
-        type: DataTypes.STRING,
-        allowNull: true,
-        validate: {
-          descriptionValid: value => {
-            const res = isVideoChannelDescriptionValid(value)
-            if (res === false) throw new Error('Video channel description is not valid.')
-          }
-        }
-      },
-      remote: {
-        type: DataTypes.BOOLEAN,
-        allowNull: false,
-        defaultValue: false
-      },
-      url: {
-        type: DataTypes.STRING(CONSTRAINTS_FIELDS.VIDEO_CHANNELS.URL.max),
-        allowNull: false,
-        validate: {
-          urlValid: value => {
-            const res = isActivityPubUrlValid(value)
-            if (res === false) throw new Error('Video channel URL is not valid.')
-          }
-        }
-      }
-    },
-    {
-      indexes: [
-        {
-          fields: [ 'accountId' ]
-        }
-      ],
-      hooks: {
-        afterDestroy
-      }
    }
-  )
-  const classMethods = [
-    associate,
-    listForApi,
-    listByAccount,
-    loadByIdAndAccount,
-    loadAndPopulateAccount,
-    loadByUUIDAndPopulateAccount,
-    loadByUUID,
-    loadByHostAndUUID,
-    loadAndPopulateAccountAndVideos,
-    countByAccount,
-    loadByUrl,
-    loadByUUIDOrUrl
  ]
-  const instanceMethods = [
+})
-    isOwned,
+export class VideoChannelModel extends Model<VideoChannelModel> {
-    toFormattedJSON,
-    toActivityPubObject
-  ]
-  addMethodsToModel(VideoChannel, classMethods, instanceMethods)
-  return VideoChannel
+  @AllowNull(false)
-}
+  @Default(DataType.UUIDV4)
+  @IsUUID(4)
+  @Column(DataType.UUID)
+  uuid: string
-// ------------------------------ METHODS ------------------------------
+  @AllowNull(false)
+  @Is('VideoChannelName', value => throwIfNotValid(value, isVideoChannelNameValid, 'name'))
+  @Column
+  name: string
-isOwned = function (this: VideoChannelInstance) {
+  @AllowNull(true)
-  return this.remote === false
+  @Is('VideoChannelDescription', value => throwIfNotValid(value, isVideoChannelDescriptionValid, 'description'))
-}
+  @Column
+  description: string
-toFormattedJSON = function (this: VideoChannelInstance) {
-  const json = {
-    id: this.id,
-    uuid: this.uuid,
-    name: this.name,
-    description: this.description,
-    isLocal: this.isOwned(),
-    createdAt: this.createdAt,
-    updatedAt: this.updatedAt
-  }
-  if (this.Account !== undefined) {
+  @AllowNull(false)
-    json['owner'] = {
+  @Column
-      name: this.Account.name,
+  remote: boolean
-      uuid: this.Account.uuid
-    }
-  }
-  if (Array.isArray(this.Videos)) {
+  @AllowNull(false)
-    json['videos'] = this.Videos.map(v => v.toFormattedJSON())
+  @Is('VideoChannelUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'url'))
-  }
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_CHANNELS.URL.max))
+  url: string
-  return json
+  @CreatedAt
-}
+  createdAt: Date
-toActivityPubObject = function (this: VideoChannelInstance) {
+  @UpdatedAt
-  let sharesObject
+  updatedAt: Date
-  if (Array.isArray(this.VideoChannelShares)) {
-    const shares: string[] = []
-    for (const videoChannelShare of this.VideoChannelShares) {
+  @ForeignKey(() => AccountModel)
-      const shareUrl = getAnnounceActivityPubUrl(this.url, videoChannelShare.Account)
+  @Column
-      shares.push(shareUrl)
+  accountId: number
-    }
-    sharesObject = activityPubCollection(shares)
+  @BelongsTo(() => AccountModel, {
-  }
+    foreignKey: {
+      allowNull: false
-  const json = {
+    },
-    type: 'VideoChannel' as 'VideoChannel',
+    onDelete: 'CASCADE'
-    id: this.url,
+  })
-    uuid: this.uuid,
+  Account: AccountModel
-    content: this.description,
-    name: this.name,
-    published: this.createdAt.toISOString(),
-    updated: this.updatedAt.toISOString(),
-    shares: sharesObject
-  }
-  return json
-}
-// ------------------------------ STATICS ------------------------------
-function associate (models) {
+  @HasMany(() => VideoModel, {
-  VideoChannel.belongsTo(models.Account, {
    foreignKey: {
-      name: 'accountId',
+      name: 'channelId',
      allowNull: false
    },
    onDelete: 'CASCADE'
  })
+  Videos: VideoModel[]
-  VideoChannel.hasMany(models.Video, {
+  @HasMany(() => VideoChannelShareModel, {
    foreignKey: {
      name: 'channelId',
      allowNull: false
    },
    onDelete: 'CASCADE'
  })
-}
+  VideoChannelShares: VideoChannelShareModel[]
-function afterDestroy (videoChannel: VideoChannelInstance) {
+  @AfterDestroy
-  if (videoChannel.isOwned()) {
+  static sendDeleteIfOwned (instance: VideoChannelModel) {
-    return sendDeleteVideoChannel(videoChannel, undefined)
+    if (instance.isOwned()) {
-  }
+      return sendDeleteVideoChannel(instance, undefined)
+    }
-  return undefined
+    return undefined
-}
+  }
-countByAccount = function (accountId: number) {
+  static countByAccount (accountId: number) {
-  const query = {
+    const query = {
-    where: {
+      where: {
-      accountId
+        accountId
+      }
    }
+    return VideoChannelModel.count(query)
  }
-  return VideoChannel.count(query)
+  static listForApi (start: number, count: number, sort: string) {
-}
+    const query = {
+      offset: start,
+      limit: count,
+      order: [ getSort(sort) ],
+      include: [
+        {
+          model: AccountModel,
+          required: true,
+          include: [ { model: ServerModel, required: false } ]
+        }
+      ]
+    }
-listForApi = function (start: number, count: number, sort: string) {
+    return VideoChannelModel.findAndCountAll(query)
-  const query = {
+      .then(({ rows, count }) => {
-    offset: start,
+        return { total: count, data: rows }
-    limit: count,
+      })
-    order: [ getSort(sort) ],
-    include: [
-      {
-        model: VideoChannel['sequelize'].models.Account,
-        required: true,
-        include: [ { model: VideoChannel['sequelize'].models.Server, required: false } ]
-      }
-    ]
  }
-  return VideoChannel.findAndCountAll(query).then(({ rows, count }) => {
+  static listByAccount (accountId: number) {
-    return { total: count, data: rows }
+    const query = {
-  })
+      order: [ getSort('createdAt') ],
-}
+      include: [
+        {
+          model: AccountModel,
+          where: {
+            id: accountId
+          },
+          required: true,
+          include: [ { model: ServerModel, required: false } ]
+        }
+      ]
+    }
-listByAccount = function (accountId: number) {
+    return VideoChannelModel.findAndCountAll(query)
-  const query = {
+      .then(({ rows, count }) => {
-    order: [ getSort('createdAt') ],
+        return { total: count, data: rows }
-    include: [
+      })
-      {
-        model: VideoChannel['sequelize'].models.Account,
-        where: {
-          id: accountId
-        },
-        required: true,
-        include: [ { model: VideoChannel['sequelize'].models.Server, required: false } ]
-      }
-    ]
  }
-  return VideoChannel.findAndCountAll(query).then(({ rows, count }) => {
+  static loadByUUID (uuid: string, t?: Sequelize.Transaction) {
-    return { total: count, data: rows }
+    const query: IFindOptions<VideoChannelModel> = {
-  })
+      where: {
-}
+        uuid
+      }
+    }
+    if (t !== undefined) query.transaction = t
-loadByUUID = function (uuid: string, t?: Sequelize.Transaction) {
+    return VideoChannelModel.findOne(query)
-  const query: Sequelize.FindOptions<VideoChannelAttributes> = {
+  }
-    where: {
-      uuid
+  static loadByUrl (url: string, t?: Sequelize.Transaction) {
+    const query: IFindOptions<VideoChannelModel> = {
+      where: {
+        url
+      },
+      include: [ AccountModel ]
    }
+    if (t !== undefined) query.transaction = t
+    return VideoChannelModel.findOne(query)
  }
-  if (t !== undefined) query.transaction = t
+  static loadByUUIDOrUrl (uuid: string, url: string, t?: Sequelize.Transaction) {
+    const query: IFindOptions<VideoChannelModel> = {
+      where: {
+        [ Sequelize.Op.or ]: [
+          { uuid },
+          { url }
+        ]
+      }
+    }
-  return VideoChannel.findOne(query)
+    if (t !== undefined) query.transaction = t
-}
-loadByUrl = function (url: string, t?: Sequelize.Transaction) {
+    return VideoChannelModel.findOne(query)
-  const query: Sequelize.FindOptions<VideoChannelAttributes> = {
-    where: {
-      url
-    },
-    include: [ VideoChannel['sequelize'].models.Account ]
  }
-  if (t !== undefined) query.transaction = t
+  static loadByHostAndUUID (fromHost: string, uuid: string, t?: Sequelize.Transaction) {
+    const query: IFindOptions<VideoChannelModel> = {
+      where: {
+        uuid
+      },
+      include: [
+        {
+          model: AccountModel,
+          include: [
+            {
+              model: ServerModel,
+              required: true,
+              where: {
+                host: fromHost
+              }
+            }
+          ]
+        }
+      ]
+    }
-  return VideoChannel.findOne(query)
+    if (t !== undefined) query.transaction = t
-}
+    return VideoChannelModel.findOne(query)
+  }
-loadByUUIDOrUrl = function (uuid: string, url: string, t?: Sequelize.Transaction) {
+  static loadByIdAndAccount (id: number, accountId: number) {
-  const query: Sequelize.FindOptions<VideoChannelAttributes> = {
+    const options = {
-    where: {
+      where: {
-      [Sequelize.Op.or]: [
+        id,
-        { uuid },
+        accountId
-        { url }
+      },
+      include: [
+        {
+          model: AccountModel,
+          include: [ { model: ServerModel, required: false } ]
+        }
      ]
    }
+    return VideoChannelModel.findOne(options)
  }
-  if (t !== undefined) query.transaction = t
+  static loadAndPopulateAccount (id: number) {
+    const options = {
+      include: [
+        {
+          model: AccountModel,
+          include: [ { model: ServerModel, required: false } ]
+        }
+      ]
+    }
-  return VideoChannel.findOne(query)
+    return VideoChannelModel.findById(id, options)
-}
+  }
-loadByHostAndUUID = function (fromHost: string, uuid: string, t?: Sequelize.Transaction) {
+  static loadByUUIDAndPopulateAccount (uuid: string) {
-  const query: Sequelize.FindOptions<VideoChannelAttributes> = {
+    const options = {
-    where: {
+      where: {
-      uuid
+        uuid
-    },
+      },
-    include: [
+      include: [
-      {
+        {
-        model: VideoChannel['sequelize'].models.Account,
+          model: AccountModel,
-        include: [
+          include: [ { model: ServerModel, required: false } ]
-          {
+        }
-            model: VideoChannel['sequelize'].models.Server,
+      ]
-            required: true,
+    }
-            where: {
-              host: fromHost
+    return VideoChannelModel.findOne(options)
-            }
-          }
-        ]
-      }
-    ]
  }
-  if (t !== undefined) query.transaction = t
+  static loadAndPopulateAccountAndVideos (id: number) {
+    const options = {
+      include: [
+        {
+          model: AccountModel,
+          include: [ { model: ServerModel, required: false } ]
+        },
+        VideoModel
+      ]
+    }
-  return VideoChannel.findOne(query)
+    return VideoChannelModel.findById(id, options)
-}
+  }
-loadByIdAndAccount = function (id: number, accountId: number) {
+  isOwned () {
-  const options = {
+    return this.remote === false
-    where: {
-      id,
-      accountId
-    },
-    include: [
-      {
-        model: VideoChannel['sequelize'].models.Account,
-        include: [ { model: VideoChannel['sequelize'].models.Server, required: false } ]
-      }
-    ]
  }
-  return VideoChannel.findOne(options)
+  toFormattedJSON () {
-}
+    const json = {
+      id: this.id,
+      uuid: this.uuid,
+      name: this.name,
+      description: this.description,
+      isLocal: this.isOwned(),
+      createdAt: this.createdAt,
+      updatedAt: this.updatedAt
+    }
-loadAndPopulateAccount = function (id: number) {
+    if (this.Account !== undefined) {
-  const options = {
+      json[ 'owner' ] = {
-    include: [
+        name: this.Account.name,
-      {
+        uuid: this.Account.uuid
-        model: VideoChannel['sequelize'].models.Account,
-        include: [ { model: VideoChannel['sequelize'].models.Server, required: false } ]
      }
-    ]
+    }
+    if (Array.isArray(this.Videos)) {
+      json[ 'videos' ] = this.Videos.map(v => v.toFormattedJSON())
+    }
+    return json
  }
-  return VideoChannel.findById(id, options)
+  toActivityPubObject () {
-}
+    let sharesObject
+    if (Array.isArray(this.VideoChannelShares)) {
+      const shares: string[] = []
-loadByUUIDAndPopulateAccount = function (uuid: string) {
+      for (const videoChannelShare of this.VideoChannelShares) {
-  const options = {
+        const shareUrl = getAnnounceActivityPubUrl(this.url, videoChannelShare.Account)
-    where: {
+        shares.push(shareUrl)
-      uuid
-    },
-    include: [
-      {
-        model: VideoChannel['sequelize'].models.Account,
-        include: [ { model: VideoChannel['sequelize'].models.Server, required: false } ]
      }
-    ]
-  }
-  return VideoChannel.findOne(options)
+      sharesObject = activityPubCollection(shares)
-}
+    }
-loadAndPopulateAccountAndVideos = function (id: number) {
+    return {
-  const options = {
+      type: 'VideoChannel' as 'VideoChannel',
-    include: [
+      id: this.url,
-      {
+      uuid: this.uuid,
-        model: VideoChannel['sequelize'].models.Account,
+      content: this.description,
-        include: [ { model: VideoChannel['sequelize'].models.Server, required: false } ]
+      name: this.name,
-      },
+      published: this.createdAt.toISOString(),
-      VideoChannel['sequelize'].models.Video
+      updated: this.updatedAt.toISOString(),
-    ]
+      shares: sharesObject
+    }
  }
-  return VideoChannel.findById(id, options)
 }
diff --git a/server/models/video/video-file-interface.ts b/server/models/video/video-file-interface.ts
deleted file mode 100644
index c9fb8b8ae..000000000
--- a/server/models/video/video-file-interface.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import * as Sequelize from 'sequelize'
-export namespace VideoFileMethods {
-}
-export interface VideoFileClass {
-}
-export interface VideoFileAttributes {
-  resolution: number
-  size: number
-  infoHash?: string
-  extname: string
-  videoId?: number
-}
-export interface VideoFileInstance extends VideoFileClass, VideoFileAttributes, Sequelize.Instance<VideoFileAttributes> {
-  id: number
-  createdAt: Date
-  updatedAt: Date
-}
-export interface VideoFileModel extends VideoFileClass, Sequelize.Model<VideoFileInstance, VideoFileAttributes> {}
diff --git a/server/models/video/video-file.ts b/server/models/video/video-file.ts
index 600141994..df4067a4e 100644
--- a/server/models/video/video-file.ts
+++ b/server/models/video/video-file.ts
@@ -1,81 +1,56 @@
 import { values } from 'lodash'
-import * as Sequelize from 'sequelize'
+import { AllowNull, BelongsTo, Column, CreatedAt, DataType, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript'
 import { isVideoFileInfoHashValid, isVideoFileResolutionValid, isVideoFileSizeValid } from '../../helpers/custom-validators/videos'
-import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
+import { CONSTRAINTS_FIELDS } from '../../initializers'
+import { throwIfNotValid } from '../utils'
+import { VideoModel } from './video'
-import { addMethodsToModel } from '../utils'
+@Table({
-import { VideoFileAttributes, VideoFileInstance } from './video-file-interface'
+  tableName: 'videoFile',
+  indexes: [
-let VideoFile: Sequelize.Model<VideoFileInstance, VideoFileAttributes>
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  VideoFile = sequelize.define<VideoFileInstance, VideoFileAttributes>('VideoFile',
    {
-      resolution: {
+      fields: [ 'videoId' ]
-        type: DataTypes.INTEGER,
-        allowNull: false,
-        validate: {
-          resolutionValid: value => {
-            const res = isVideoFileResolutionValid(value)
-            if (res === false) throw new Error('Video file resolution is not valid.')
-          }
-        }
-      },
-      size: {
-        type: DataTypes.BIGINT,
-        allowNull: false,
-        validate: {
-          sizeValid: value => {
-            const res = isVideoFileSizeValid(value)
-            if (res === false) throw new Error('Video file size is not valid.')
-          }
-        }
-      },
-      extname: {
-        type: DataTypes.ENUM(values(CONSTRAINTS_FIELDS.VIDEOS.EXTNAME)),
-        allowNull: false
-      },
-      infoHash: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        validate: {
-          infoHashValid: value => {
-            const res = isVideoFileInfoHashValid(value)
-            if (res === false) throw new Error('Video file info hash is not valid.')
-          }
-        }
-      }
    },
    {
-      indexes: [
+      fields: [ 'infoHash' ]
-        {
-          fields: [ 'videoId' ]
-        },
-        {
-          fields: [ 'infoHash' ]
-        }
-      ]
    }
-  )
-  const classMethods = [
-    associate
  ]
-  addMethodsToModel(VideoFile, classMethods)
+})
+export class VideoFileModel extends Model<VideoFileModel> {
-  return VideoFile
+  @CreatedAt
-}
+  createdAt: Date
-// ------------------------------ STATICS ------------------------------
+  @UpdatedAt
+  updatedAt: Date
-function associate (models) {
-  VideoFile.belongsTo(models.Video, {
+  @AllowNull(false)
+  @Is('VideoFileResolution', value => throwIfNotValid(value, isVideoFileResolutionValid, 'resolution'))
+  @Column
+  resolution: number
+  @AllowNull(false)
+  @Is('VideoFileSize', value => throwIfNotValid(value, isVideoFileSizeValid, 'size'))
+  @Column(DataType.BIGINT)
+  size: number
+  @AllowNull(false)
+  @Column(DataType.ENUM(values(CONSTRAINTS_FIELDS.VIDEOS.EXTNAME)))
+  extname: string
+  @AllowNull(false)
+  @Is('VideoFileSize', value => throwIfNotValid(value, isVideoFileInfoHashValid, 'info hash'))
+  @Column
+  infoHash: string
+  @ForeignKey(() => VideoModel)
+  @Column
+  videoId: number
+  @BelongsTo(() => VideoModel, {
    foreignKey: {
-      name: 'videoId',
      allowNull: false
    },
    onDelete: 'CASCADE'
  })
+  Video: VideoModel
 }
-// ------------------------------ METHODS ------------------------------
diff --git a/server/models/video/video-interface.ts b/server/models/video/video-interface.ts
deleted file mode 100644
index 2a63350af..000000000
--- a/server/models/video/video-interface.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import * as Bluebird from 'bluebird'
-import * as Sequelize from 'sequelize'
-import { VideoTorrentObject } from '../../../shared/models/activitypub/objects/video-torrent-object'
-import { ResultList } from '../../../shared/models/result-list.model'
-import { Video as FormattedVideo, VideoDetails as FormattedDetailsVideo } from '../../../shared/models/videos/video.model'
-import { AccountVideoRateInstance } from '../account/account-video-rate-interface'
-import { TagAttributes, TagInstance } from './tag-interface'
-import { VideoChannelInstance } from './video-channel-interface'
-import { VideoFileAttributes, VideoFileInstance } from './video-file-interface'
-import { VideoShareInstance } from './video-share-interface'
-export namespace VideoMethods {
-  export type GetThumbnailName = (this: VideoInstance) => string
-  export type GetPreviewName = (this: VideoInstance) => string
-  export type IsOwned = (this: VideoInstance) => boolean
-  export type ToFormattedJSON = (this: VideoInstance) => FormattedVideo
-  export type ToFormattedDetailsJSON = (this: VideoInstance) => FormattedDetailsVideo
-  export type GetOriginalFile = (this: VideoInstance) => VideoFileInstance
-  export type GetTorrentFileName = (this: VideoInstance, videoFile: VideoFileInstance) => string
-  export type GetVideoFilename = (this: VideoInstance, videoFile: VideoFileInstance) => string
-  export type CreatePreview = (this: VideoInstance, videoFile: VideoFileInstance) => Promise<string>
-  export type CreateThumbnail = (this: VideoInstance, videoFile: VideoFileInstance) => Promise<string>
-  export type GetVideoFilePath = (this: VideoInstance, videoFile: VideoFileInstance) => string
-  export type CreateTorrentAndSetInfoHash = (this: VideoInstance, videoFile: VideoFileInstance) => Promise<void>
-  export type ToActivityPubObject = (this: VideoInstance) => VideoTorrentObject
-  export type OptimizeOriginalVideofile = (this: VideoInstance) => Promise<void>
-  export type TranscodeOriginalVideofile = (this: VideoInstance, resolution: number) => Promise<void>
-  export type GetOriginalFileHeight = (this: VideoInstance) => Promise<number>
-  export type GetEmbedPath = (this: VideoInstance) => string
-  export type GetThumbnailPath = (this: VideoInstance) => string
-  export type GetPreviewPath = (this: VideoInstance) => string
-  export type GetDescriptionPath = (this: VideoInstance) => string
-  export type GetTruncatedDescription = (this: VideoInstance) => string
-  export type GetCategoryLabel = (this: VideoInstance) => string
-  export type GetLicenceLabel = (this: VideoInstance) => string
-  export type GetLanguageLabel = (this: VideoInstance) => string
-  export type List = () => Bluebird<VideoInstance[]>
-  export type ListAllAndSharedByAccountForOutbox = (
-    accountId: number,
-    start: number,
-    count: number
-  ) => Bluebird< ResultList<VideoInstance> >
-  export type ListForApi = (start: number, count: number, sort: string) => Bluebird< ResultList<VideoInstance> >
-  export type ListUserVideosForApi = (userId: number, start: number, count: number, sort: string) => Bluebird< ResultList<VideoInstance> >
-  export type SearchAndPopulateAccountAndServerAndTags = (
-    value: string,
-    start: number,
-    count: number,
-    sort: string
-  ) => Bluebird< ResultList<VideoInstance> >
-  export type Load = (id: number) => Bluebird<VideoInstance>
-  export type LoadByUUID = (uuid: string, t?: Sequelize.Transaction) => Bluebird<VideoInstance>
-  export type LoadByUrlAndPopulateAccount = (url: string, t?: Sequelize.Transaction) => Bluebird<VideoInstance>
-  export type LoadAndPopulateAccountAndServerAndTags = (id: number) => Bluebird<VideoInstance>
-  export type LoadByUUIDAndPopulateAccountAndServerAndTags = (uuid: string) => Bluebird<VideoInstance>
-  export type LoadByUUIDOrURL = (uuid: string, url: string, t?: Sequelize.Transaction) => Bluebird<VideoInstance>
-  export type RemoveThumbnail = (this: VideoInstance) => Promise<void>
-  export type RemovePreview = (this: VideoInstance) => Promise<void>
-  export type RemoveFile = (this: VideoInstance, videoFile: VideoFileInstance) => Promise<void>
-  export type RemoveTorrent = (this: VideoInstance, videoFile: VideoFileInstance) => Promise<void>
-}
-export interface VideoClass {
-  list: VideoMethods.List
-  listAllAndSharedByAccountForOutbox: VideoMethods.ListAllAndSharedByAccountForOutbox
-  listForApi: VideoMethods.ListForApi
-  listUserVideosForApi: VideoMethods.ListUserVideosForApi
-  load: VideoMethods.Load
-  loadAndPopulateAccountAndServerAndTags: VideoMethods.LoadAndPopulateAccountAndServerAndTags
-  loadByUUID: VideoMethods.LoadByUUID
-  loadByUrlAndPopulateAccount: VideoMethods.LoadByUrlAndPopulateAccount
-  loadByUUIDOrURL: VideoMethods.LoadByUUIDOrURL
-  loadByUUIDAndPopulateAccountAndServerAndTags: VideoMethods.LoadByUUIDAndPopulateAccountAndServerAndTags
-  searchAndPopulateAccountAndServerAndTags: VideoMethods.SearchAndPopulateAccountAndServerAndTags
-}
-export interface VideoAttributes {
-  id?: number
-  uuid?: string
-  name: string
-  category: number
-  licence: number
-  language: number
-  nsfw: boolean
-  description: string
-  duration: number
-  privacy: number
-  views?: number
-  likes?: number
-  dislikes?: number
-  remote: boolean
-  url?: string
-  createdAt?: Date
-  updatedAt?: Date
-  parentId?: number
-  channelId?: number
-  VideoChannel?: VideoChannelInstance
-  Tags?: TagInstance[]
-  VideoFiles?: VideoFileInstance[]
-  VideoShares?: VideoShareInstance[]
-  AccountVideoRates?: AccountVideoRateInstance[]
-}
-export interface VideoInstance extends VideoClass, VideoAttributes, Sequelize.Instance<VideoAttributes> {
-  createPreview: VideoMethods.CreatePreview
-  createThumbnail: VideoMethods.CreateThumbnail
-  createTorrentAndSetInfoHash: VideoMethods.CreateTorrentAndSetInfoHash
-  getOriginalFile: VideoMethods.GetOriginalFile
-  getPreviewName: VideoMethods.GetPreviewName
-  getPreviewPath: VideoMethods.GetPreviewPath
-  getThumbnailName: VideoMethods.GetThumbnailName
-  getThumbnailPath: VideoMethods.GetThumbnailPath
-  getTorrentFileName: VideoMethods.GetTorrentFileName
-  getVideoFilename: VideoMethods.GetVideoFilename
-  getVideoFilePath: VideoMethods.GetVideoFilePath
-  isOwned: VideoMethods.IsOwned
-  removeFile: VideoMethods.RemoveFile
-  removePreview: VideoMethods.RemovePreview
-  removeThumbnail: VideoMethods.RemoveThumbnail
-  removeTorrent: VideoMethods.RemoveTorrent
-  toActivityPubObject: VideoMethods.ToActivityPubObject
-  toFormattedJSON: VideoMethods.ToFormattedJSON
-  toFormattedDetailsJSON: VideoMethods.ToFormattedDetailsJSON
-  optimizeOriginalVideofile: VideoMethods.OptimizeOriginalVideofile
-  transcodeOriginalVideofile: VideoMethods.TranscodeOriginalVideofile
-  getOriginalFileHeight: VideoMethods.GetOriginalFileHeight
-  getEmbedPath: VideoMethods.GetEmbedPath
-  getDescriptionPath: VideoMethods.GetDescriptionPath
-  getTruncatedDescription: VideoMethods.GetTruncatedDescription
-  getCategoryLabel: VideoMethods.GetCategoryLabel
-  getLicenceLabel: VideoMethods.GetLicenceLabel
-  getLanguageLabel: VideoMethods.GetLanguageLabel
-  setTags: Sequelize.HasManySetAssociationsMixin<TagAttributes, string>
-  addVideoFile: Sequelize.HasManyAddAssociationMixin<VideoFileAttributes, string>
-  setVideoFiles: Sequelize.HasManySetAssociationsMixin<VideoFileAttributes, string>
-}
-export interface VideoModel extends VideoClass, Sequelize.Model<VideoInstance, VideoAttributes> {}
diff --git a/server/models/video/video-share-interface.ts b/server/models/video/video-share-interface.ts
deleted file mode 100644
index 3946303f1..000000000
--- a/server/models/video/video-share-interface.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import * as Bluebird from 'bluebird'
-import * as Sequelize from 'sequelize'
-import { AccountInstance } from '../account/account-interface'
-import { VideoInstance } from './video-interface'
-export namespace VideoShareMethods {
-  export type LoadAccountsByShare = (videoId: number, t: Sequelize.Transaction) => Bluebird<AccountInstance[]>
-  export type Load = (accountId: number, videoId: number, t: Sequelize.Transaction) => Bluebird<VideoShareInstance>
-}
-export interface VideoShareClass {
-  loadAccountsByShare: VideoShareMethods.LoadAccountsByShare
-  load: VideoShareMethods.Load
-}
-export interface VideoShareAttributes {
-  accountId: number
-  videoId: number
-}
-export interface VideoShareInstance extends VideoShareClass, VideoShareAttributes, Sequelize.Instance<VideoShareAttributes> {
-  id: number
-  createdAt: Date
-  updatedAt: Date
-  Account?: AccountInstance
-  Video?: VideoInstance
-}
-export interface VideoShareModel extends VideoShareClass, Sequelize.Model<VideoShareInstance, VideoShareAttributes> {}
diff --git a/server/models/video/video-share.ts b/server/models/video/video-share.ts
index 37e405fa9..01b6d3d34 100644
--- a/server/models/video/video-share.ts
+++ b/server/models/video/video-share.ts
@@ -1,84 +1,78 @@
 import * as Sequelize from 'sequelize'
+import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript'
+import { AccountModel } from '../account/account'
+import { VideoModel } from './video'
-import { addMethodsToModel } from '../utils'
+@Table({
-import { VideoShareAttributes, VideoShareInstance, VideoShareMethods } from './video-share-interface'
+  tableName: 'videoShare',
+  indexes: [
-let VideoShare: Sequelize.Model<VideoShareInstance, VideoShareAttributes>
-let loadAccountsByShare: VideoShareMethods.LoadAccountsByShare
-let load: VideoShareMethods.Load
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  VideoShare = sequelize.define<VideoShareInstance, VideoShareAttributes>('VideoShare',
-    { },
    {
-      indexes: [
+      fields: [ 'accountId' ]
-        {
+    },
-          fields: [ 'accountId' ]
+    {
-        },
+      fields: [ 'videoId' ]
-        {
-          fields: [ 'videoId' ]
-        }
-      ]
    }
-  )
-  const classMethods = [
-    associate,
-    loadAccountsByShare,
-    load
  ]
-  addMethodsToModel(VideoShare, classMethods)
+})
+export class VideoShareModel extends Model<VideoShareModel> {
+  @CreatedAt
+  createdAt: Date
-  return VideoShare
+  @UpdatedAt
-}
+  updatedAt: Date
-// ------------------------------ METHODS ------------------------------
+  @ForeignKey(() => AccountModel)
+  @Column
+  accountId: number
-function associate (models) {
+  @BelongsTo(() => AccountModel, {
-  VideoShare.belongsTo(models.Account, {
    foreignKey: {
-      name: 'accountId',
      allowNull: false
    },
    onDelete: 'cascade'
  })
+  Account: AccountModel
-  VideoShare.belongsTo(models.Video, {
+  @ForeignKey(() => VideoModel)
+  @Column
+  videoId: number
+  @BelongsTo(() => VideoModel, {
    foreignKey: {
-      name: 'videoId',
+      allowNull: false
-      allowNull: true
    },
    onDelete: 'cascade'
  })
-}
+  Video: VideoModel
-load = function (accountId: number, videoId: number, t: Sequelize.Transaction) {
-  return VideoShare.findOne({
-    where: {
-      accountId,
-      videoId
-    },
-    include: [
-      VideoShare['sequelize'].models.Account
-    ],
-    transaction: t
-  })
-}
-loadAccountsByShare = function (videoId: number, t: Sequelize.Transaction) {
+  static load (accountId: number, videoId: number, t: Sequelize.Transaction) {
-  const query = {
+    return VideoShareModel.findOne({
-    where: {
+      where: {
-      videoId
+        accountId,
-    },
+        videoId
-    include: [
+      },
-      {
+      include: [
-        model: VideoShare['sequelize'].models.Account,
+        AccountModel
-        required: true
+      ],
-      }
+      transaction: t
-    ],
+    })
-    transaction: t
  }
-  return VideoShare.findAll(query)
+  static loadAccountsByShare (videoId: number, t: Sequelize.Transaction) {
-    .then(res => res.map(r => r.Account))
+    const query = {
+      where: {
+        videoId
+      },
+      include: [
+        {
+          model: AccountModel,
+          required: true
+        }
+      ],
+      transaction: t
+    }
+    return VideoShareModel.findAll(query)
+      .then(res => res.map(r => r.Account))
+  }
 }
diff --git a/server/models/video/video-tag-interface.ts b/server/models/video/video-tag-interface.ts
deleted file mode 100644
index f928cecff..000000000
--- a/server/models/video/video-tag-interface.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import * as Sequelize from 'sequelize'
-export namespace VideoTagMethods {
-}
-export interface VideoTagClass {
-}
-export interface VideoTagAttributes {
-}
-export interface VideoTagInstance extends VideoTagClass, VideoTagAttributes, Sequelize.Instance<VideoTagAttributes> {
-  id: number
-  createdAt: Date
-  updatedAt: Date
-}
-export interface VideoTagModel extends VideoTagClass, Sequelize.Model<VideoTagInstance, VideoTagAttributes> {}
diff --git a/server/models/video/video-tag.ts b/server/models/video/video-tag.ts
index ac45374f8..ca15e3426 100644
--- a/server/models/video/video-tag.ts
+++ b/server/models/video/video-tag.ts
@@ -1,23 +1,30 @@
-import * as Sequelize from 'sequelize'
+import { Column, CreatedAt, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript'
+import { TagModel } from './tag'
+import { VideoModel } from './video'
-import {
+@Table({
-  VideoTagInstance,
+  tableName: 'videoTag',
-  VideoTagAttributes
+  indexes: [
-} from './video-tag-interface'
+    {
+      fields: [ 'videoId' ]
+    },
+    {
+      fields: [ 'tagId' ]
+    }
+  ]
+})
+export class VideoTagModel extends Model<VideoTagModel> {
+  @CreatedAt
+  createdAt: Date
-let VideoTag: Sequelize.Model<VideoTagInstance, VideoTagAttributes>
+  @UpdatedAt
+  updatedAt: Date
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
+  @ForeignKey(() => VideoModel)
-  VideoTag = sequelize.define<VideoTagInstance, VideoTagAttributes>('VideoTag', {}, {
+  @Column
-    indexes: [
+  videoId: number
-      {
-        fields: [ 'videoId' ]
-      },
-      {
-        fields: [ 'tagId' ]
-      }
-    ]
-  })
-  return VideoTag
+  @ForeignKey(() => TagModel)
+  @Column
+  tagId: number
 }
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index d46fdeebe..9e26f9bbe 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -4,21 +4,52 @@ import * as magnetUtil from 'magnet-uri'
 import * as parseTorrent from 'parse-torrent'
 import { join } from 'path'
 import * as Sequelize from 'sequelize'
+import {
+  AfterDestroy,
+  AllowNull,
+  BelongsTo,
+  BelongsToMany,
+  Column,
+  CreatedAt,
+  DataType,
+  Default,
+  ForeignKey,
+  HasMany,
+  IFindOptions,
+  Is,
+  IsInt,
+  IsUUID,
+  Min,
+  Model,
+  Table,
+  UpdatedAt
+} from 'sequelize-typescript'
+import { IIncludeOptions } from 'sequelize-typescript/lib/interfaces/IIncludeOptions'
 import { VideoPrivacy, VideoResolution } from '../../../shared'
-import { VideoTorrentObject } from '../../../shared/models/activitypub/objects/video-torrent-object'
+import { VideoTorrentObject } from '../../../shared/models/activitypub/objects'
-import { activityPubCollection } from '../../helpers/activitypub'
+import {
-import { createTorrentPromise, renamePromise, statPromise, unlinkPromise, writeFilePromise } from '../../helpers/core-utils'
+  activityPubCollection,
-import { isVideoCategoryValid, isVideoLanguageValid, isVideoPrivacyValid } from '../../helpers/custom-validators/videos'
+  createTorrentPromise,
-import { generateImageFromVideoFile, getVideoFileHeight, transcode } from '../../helpers/ffmpeg-utils'
+  generateImageFromVideoFile,
+  getVideoFileHeight,
+  logger,
+  renamePromise,
+  statPromise,
+  transcode,
+  unlinkPromise,
+  writeFilePromise
+} from '../../helpers'
+import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub'
 import {
-  isActivityPubUrlValid,
+  isVideoCategoryValid,
  isVideoDescriptionValid,
  isVideoDurationValid,
+  isVideoLanguageValid,
  isVideoLicenceValid,
  isVideoNameValid,
-  isVideoNSFWValid
+  isVideoNSFWValid,
-} from '../../helpers/index'
+  isVideoPrivacyValid
-import { logger } from '../../helpers/logger'
+} from '../../helpers/custom-validators/videos'
 import {
  API_VERSION,
  CONFIG,
@@ -31,1169 +62,1025 @@ import {
  VIDEO_LANGUAGES,
  VIDEO_LICENCES,
  VIDEO_PRIVACIES
-} from '../../initializers/constants'
+} from '../../initializers'
-import { getAnnounceActivityPubUrl } from '../../lib/activitypub/url'
+import { getAnnounceActivityPubUrl } from '../../lib/activitypub'
 import { sendDeleteVideo } from '../../lib/index'
-import { addMethodsToModel, getSort } from '../utils'
+import { AccountModel } from '../account/account'
-import { TagInstance } from './tag-interface'
+import { AccountVideoRateModel } from '../account/account-video-rate'
-import { VideoFileInstance, VideoFileModel } from './video-file-interface'
+import { ServerModel } from '../server/server'
-import { VideoAttributes, VideoInstance, VideoMethods } from './video-interface'
+import { getSort, throwIfNotValid } from '../utils'
+import { TagModel } from './tag'
-let Video: Sequelize.Model<VideoInstance, VideoAttributes>
+import { VideoAbuseModel } from './video-abuse'
-let getOriginalFile: VideoMethods.GetOriginalFile
+import { VideoChannelModel } from './video-channel'
-let getVideoFilename: VideoMethods.GetVideoFilename
+import { VideoFileModel } from './video-file'
-let getThumbnailName: VideoMethods.GetThumbnailName
+import { VideoShareModel } from './video-share'
-let getThumbnailPath: VideoMethods.GetThumbnailPath
+import { VideoTagModel } from './video-tag'
-let getPreviewName: VideoMethods.GetPreviewName
-let getPreviewPath: VideoMethods.GetPreviewPath
+@Table({
-let getTorrentFileName: VideoMethods.GetTorrentFileName
+  tableName: 'video',
-let isOwned: VideoMethods.IsOwned
+  indexes: [
-let toFormattedJSON: VideoMethods.ToFormattedJSON
-let toFormattedDetailsJSON: VideoMethods.ToFormattedDetailsJSON
-let toActivityPubObject: VideoMethods.ToActivityPubObject
-let optimizeOriginalVideofile: VideoMethods.OptimizeOriginalVideofile
-let transcodeOriginalVideofile: VideoMethods.TranscodeOriginalVideofile
-let createPreview: VideoMethods.CreatePreview
-let createThumbnail: VideoMethods.CreateThumbnail
-let getVideoFilePath: VideoMethods.GetVideoFilePath
-let createTorrentAndSetInfoHash: VideoMethods.CreateTorrentAndSetInfoHash
-let getOriginalFileHeight: VideoMethods.GetOriginalFileHeight
-let getEmbedPath: VideoMethods.GetEmbedPath
-let getDescriptionPath: VideoMethods.GetDescriptionPath
-let getTruncatedDescription: VideoMethods.GetTruncatedDescription
-let getCategoryLabel: VideoMethods.GetCategoryLabel
-let getLicenceLabel: VideoMethods.GetLicenceLabel
-let getLanguageLabel: VideoMethods.GetLanguageLabel
-let list: VideoMethods.List
-let listForApi: VideoMethods.ListForApi
-let listAllAndSharedByAccountForOutbox: VideoMethods.ListAllAndSharedByAccountForOutbox
-let listUserVideosForApi: VideoMethods.ListUserVideosForApi
-let load: VideoMethods.Load
-let loadByUrlAndPopulateAccount: VideoMethods.LoadByUrlAndPopulateAccount
-let loadByUUID: VideoMethods.LoadByUUID
-let loadByUUIDOrURL: VideoMethods.LoadByUUIDOrURL
-let loadAndPopulateAccountAndServerAndTags: VideoMethods.LoadAndPopulateAccountAndServerAndTags
-let loadByUUIDAndPopulateAccountAndServerAndTags: VideoMethods.LoadByUUIDAndPopulateAccountAndServerAndTags
-let searchAndPopulateAccountAndServerAndTags: VideoMethods.SearchAndPopulateAccountAndServerAndTags
-let removeThumbnail: VideoMethods.RemoveThumbnail
-let removePreview: VideoMethods.RemovePreview
-let removeFile: VideoMethods.RemoveFile
-let removeTorrent: VideoMethods.RemoveTorrent
-export default function (sequelize: Sequelize.Sequelize, DataTypes: Sequelize.DataTypes) {
-  Video = sequelize.define<VideoInstance, VideoAttributes>('Video',
    {
-      uuid: {
+      fields: [ 'name' ]
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
-        allowNull: false,
-        validate: {
-          isUUID: 4
-        }
-      },
-      name: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        validate: {
-          nameValid: value => {
-            const res = isVideoNameValid(value)
-            if (res === false) throw new Error('Video name is not valid.')
-          }
-        }
-      },
-      category: {
-        type: DataTypes.INTEGER,
-        allowNull: true,
-        defaultValue: null,
-        validate: {
-          categoryValid: value => {
-            const res = isVideoCategoryValid(value)
-            if (res === false) throw new Error('Video category is not valid.')
-          }
-        }
-      },
-      licence: {
-        type: DataTypes.INTEGER,
-        allowNull: true,
-        defaultValue: null,
-        validate: {
-          licenceValid: value => {
-            const res = isVideoLicenceValid(value)
-            if (res === false) throw new Error('Video licence is not valid.')
-          }
-        }
-      },
-      language: {
-        type: DataTypes.INTEGER,
-        allowNull: true,
-        defaultValue: null,
-        validate: {
-          languageValid: value => {
-            const res = isVideoLanguageValid(value)
-            if (res === false) throw new Error('Video language is not valid.')
-          }
-        }
-      },
-      privacy: {
-        type: DataTypes.INTEGER,
-        allowNull: false,
-        validate: {
-          privacyValid: value => {
-            const res = isVideoPrivacyValid(value)
-            if (res === false) throw new Error('Video privacy is not valid.')
-          }
-        }
-      },
-      nsfw: {
-        type: DataTypes.BOOLEAN,
-        allowNull: false,
-        validate: {
-          nsfwValid: value => {
-            const res = isVideoNSFWValid(value)
-            if (res === false) throw new Error('Video nsfw attribute is not valid.')
-          }
-        }
-      },
-      description: {
-        type: DataTypes.STRING(CONSTRAINTS_FIELDS.VIDEOS.DESCRIPTION.max),
-        allowNull: true,
-        defaultValue: null,
-        validate: {
-          descriptionValid: value => {
-            const res = isVideoDescriptionValid(value)
-            if (res === false) throw new Error('Video description is not valid.')
-          }
-        }
-      },
-      duration: {
-        type: DataTypes.INTEGER,
-        allowNull: false,
-        validate: {
-          durationValid: value => {
-            const res = isVideoDurationValid(value)
-            if (res === false) throw new Error('Video duration is not valid.')
-          }
-        }
-      },
-      views: {
-        type: DataTypes.INTEGER,
-        allowNull: false,
-        defaultValue: 0,
-        validate: {
-          min: 0,
-          isInt: true
-        }
-      },
-      likes: {
-        type: DataTypes.INTEGER,
-        allowNull: false,
-        defaultValue: 0,
-        validate: {
-          min: 0,
-          isInt: true
-        }
-      },
-      dislikes: {
-        type: DataTypes.INTEGER,
-        allowNull: false,
-        defaultValue: 0,
-        validate: {
-          min: 0,
-          isInt: true
-        }
-      },
-      remote: {
-        type: DataTypes.BOOLEAN,
-        allowNull: false,
-        defaultValue: false
-      },
-      url: {
-        type: DataTypes.STRING(CONSTRAINTS_FIELDS.VIDEOS.URL.max),
-        allowNull: false,
-        validate: {
-          urlValid: value => {
-            const res = isActivityPubUrlValid(value)
-            if (res === false) throw new Error('Video URL is not valid.')
-          }
-        }
-      }
    },
    {
-      indexes: [
+      fields: [ 'createdAt' ]
-        {
+    },
-          fields: [ 'name' ]
+    {
-        },
+      fields: [ 'duration' ]
-        {
+    },
-          fields: [ 'createdAt' ]
+    {
-        },
+      fields: [ 'views' ]
-        {
+    },
-          fields: [ 'duration' ]
+    {
-        },
+      fields: [ 'likes' ]
-        {
+    },
-          fields: [ 'views' ]
+    {
-        },
+      fields: [ 'uuid' ]
-        {
+    },
-          fields: [ 'likes' ]
+    {
-        },
+      fields: [ 'channelId' ]
-        {
-          fields: [ 'uuid' ]
-        },
-        {
-          fields: [ 'channelId' ]
-        }
-      ],
-      hooks: {
-        afterDestroy
-      }
    }
-  )
-  const classMethods = [
-    associate,
-    list,
-    listAllAndSharedByAccountForOutbox,
-    listForApi,
-    listUserVideosForApi,
-    load,
-    loadByUrlAndPopulateAccount,
-    loadAndPopulateAccountAndServerAndTags,
-    loadByUUIDOrURL,
-    loadByUUID,
-    loadByUUIDAndPopulateAccountAndServerAndTags,
-    searchAndPopulateAccountAndServerAndTags
-  ]
-  const instanceMethods = [
-    createPreview,
-    createThumbnail,
-    createTorrentAndSetInfoHash,
-    getPreviewName,
-    getPreviewPath,
-    getThumbnailName,
-    getThumbnailPath,
-    getTorrentFileName,
-    getVideoFilename,
-    getVideoFilePath,
-    getOriginalFile,
-    isOwned,
-    removeFile,
-    removePreview,
-    removeThumbnail,
-    removeTorrent,
-    toActivityPubObject,
-    toFormattedJSON,
-    toFormattedDetailsJSON,
-    optimizeOriginalVideofile,
-    transcodeOriginalVideofile,
-    getOriginalFileHeight,
-    getEmbedPath,
-    getTruncatedDescription,
-    getDescriptionPath,
-    getCategoryLabel,
-    getLicenceLabel,
-    getLanguageLabel
  ]
-  addMethodsToModel(Video, classMethods, instanceMethods)
+})
+export class VideoModel extends Model<VideoModel> {
-  return Video
-}
+  @AllowNull(false)
+  @Default(DataType.UUIDV4)
-// ------------------------------ METHODS ------------------------------
+  @IsUUID(4)
+  @Column(DataType.UUID)
-function associate (models) {
+  uuid: string
-  Video.belongsTo(models.VideoChannel, {
+  @AllowNull(false)
+  @Is('VideoName', value => throwIfNotValid(value, isVideoNameValid, 'name'))
+  @Column
+  name: string
+  @AllowNull(true)
+  @Default(null)
+  @Is('VideoCategory', value => throwIfNotValid(value, isVideoCategoryValid, 'category'))
+  @Column
+  category: number
+  @AllowNull(true)
+  @Default(null)
+  @Is('VideoLicence', value => throwIfNotValid(value, isVideoLicenceValid, 'licence'))
+  @Column
+  licence: number
+  @AllowNull(true)
+  @Default(null)
+  @Is('VideoLanguage', value => throwIfNotValid(value, isVideoLanguageValid, 'language'))
+  @Column
+  language: number
+  @AllowNull(false)
+  @Is('VideoPrivacy', value => throwIfNotValid(value, isVideoPrivacyValid, 'privacy'))
+  @Column
+  privacy: number
+  @AllowNull(false)
+  @Is('VideoNSFW', value => throwIfNotValid(value, isVideoNSFWValid, 'NSFW boolean'))
+  @Column
+  nsfw: boolean
+  @AllowNull(true)
+  @Default(null)
+  @Is('VideoDescription', value => throwIfNotValid(value, isVideoDescriptionValid, 'description'))
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.DESCRIPTION.max))
+  description: string
+  @AllowNull(false)
+  @Is('VideoDuration', value => throwIfNotValid(value, isVideoDurationValid, 'duration'))
+  @Column
+  duration: number
+  @AllowNull(false)
+  @Default(0)
+  @IsInt
+  @Min(0)
+  @Column
+  views: number
+  @AllowNull(false)
+  @Default(0)
+  @IsInt
+  @Min(0)
+  @Column
+  likes: number
+  @AllowNull(false)
+  @Default(0)
+  @IsInt
+  @Min(0)
+  @Column
+  dislikes: number
+  @AllowNull(false)
+  @Column
+  remote: boolean
+  @AllowNull(false)
+  @Is('VideoUrl', value => throwIfNotValid(value, isActivityPubUrlValid, 'url'))
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEOS.URL.max))
+  url: string
+  @CreatedAt
+  createdAt: Date
+  @UpdatedAt
+  updatedAt: Date
+  @ForeignKey(() => VideoChannelModel)
+  @Column
+  channelId: number
+  @BelongsTo(() => VideoChannelModel, {
    foreignKey: {
-      name: 'channelId',
      allowNull: false
    },
    onDelete: 'cascade'
  })
+  VideoChannel: VideoChannelModel
-  Video.belongsToMany(models.Tag, {
+  @BelongsToMany(() => TagModel, {
    foreignKey: 'videoId',
-    through: models.VideoTag,
+    through: () => VideoTagModel,
-    onDelete: 'cascade'
+    onDelete: 'CASCADE'
  })
+  Tags: TagModel[]
-  Video.hasMany(models.VideoAbuse, {
+  @HasMany(() => VideoAbuseModel, {
    foreignKey: {
      name: 'videoId',
      allowNull: false
    },
    onDelete: 'cascade'
  })
+  VideoAbuses: VideoAbuseModel[]
-  Video.hasMany(models.VideoFile, {
+  @HasMany(() => VideoFileModel, {
    foreignKey: {
      name: 'videoId',
      allowNull: false
    },
    onDelete: 'cascade'
  })
+  VideoFiles: VideoFileModel[]
-  Video.hasMany(models.VideoShare, {
+  @HasMany(() => VideoShareModel, {
    foreignKey: {
      name: 'videoId',
      allowNull: false
    },
    onDelete: 'cascade'
  })
+  VideoShares: VideoShareModel[]
-  Video.hasMany(models.AccountVideoRate, {
+  @HasMany(() => AccountVideoRateModel, {
    foreignKey: {
      name: 'videoId',
      allowNull: false
    },
    onDelete: 'cascade'
  })
-}
+  AccountVideoRates: AccountVideoRateModel[]
-function afterDestroy (video: VideoInstance) {
-  const tasks = []
-  tasks.push(
+  @AfterDestroy
-    video.removeThumbnail()
+  static removeFilesAndSendDelete (instance: VideoModel) {
-  )
+    const tasks = []
-  if (video.isOwned()) {
    tasks.push(
-      video.removePreview(),
+      instance.removeThumbnail()
-      sendDeleteVideo(video, undefined)
    )
-    // Remove physical files and torrents
+    if (instance.isOwned()) {
-    video.VideoFiles.forEach(file => {
+      tasks.push(
-      tasks.push(video.removeFile(file))
+        instance.removePreview(),
-      tasks.push(video.removeTorrent(file))
+        sendDeleteVideo(instance, undefined)
-    })
+      )
-  }
-  return Promise.all(tasks)
-    .catch(err => {
-      logger.error('Some errors when removing files of video %s in after destroy hook.', video.uuid, err)
-    })
-}
-getOriginalFile = function (this: VideoInstance) {
-  if (Array.isArray(this.VideoFiles) === false) return undefined
-  // The original file is the file that have the higher resolution
+      // Remove physical files and torrents
-  return maxBy(this.VideoFiles, file => file.resolution)
+      instance.VideoFiles.forEach(file => {
-}
+        tasks.push(instance.removeFile(file))
+        tasks.push(instance.removeTorrent(file))
+      })
+    }
-getVideoFilename = function (this: VideoInstance, videoFile: VideoFileInstance) {
+    return Promise.all(tasks)
-  return this.uuid + '-' + videoFile.resolution + videoFile.extname
+      .catch(err => {
-}
+        logger.error('Some errors when removing files of video %s in after destroy hook.', instance.uuid, err)
+      })
+  }
-getThumbnailName = function (this: VideoInstance) {
+  static list () {
-  // We always have a copy of the thumbnail
+    const query = {
-  const extension = '.jpg'
+      include: [ VideoFileModel ]
-  return this.uuid + extension
+    }
-}
-getPreviewName = function (this: VideoInstance) {
+    return VideoModel.findAll(query)
-  const extension = '.jpg'
+  }
-  return this.uuid + extension
-}
-getTorrentFileName = function (this: VideoInstance, videoFile: VideoFileInstance) {
+  static listAllAndSharedByAccountForOutbox (accountId: number, start: number, count: number) {
-  const extension = '.torrent'
+    function getRawQuery (select: string) {
-  return this.uuid + '-' + videoFile.resolution + extension
+      const queryVideo = 'SELECT ' + select + ' FROM "video" AS "Video" ' +
-}
+        'INNER JOIN "videoChannel" AS "VideoChannel" ON "VideoChannel"."id" = "Video"."channelId" ' +
+        'WHERE "VideoChannel"."accountId" = ' + accountId
+      const queryVideoShare = 'SELECT ' + select + ' FROM "videoShare" AS "VideoShare" ' +
+        'INNER JOIN "video" AS "Video" ON "Video"."id" = "VideoShare"."videoId" ' +
+        'WHERE "VideoShare"."accountId" = ' + accountId
-isOwned = function (this: VideoInstance) {
+      return `(${queryVideo}) UNION (${queryVideoShare})`
-  return this.remote === false
+    }
-}
-createPreview = function (this: VideoInstance, videoFile: VideoFileInstance) {
+    const rawQuery = getRawQuery('"Video"."id"')
-  const imageSize = PREVIEWS_SIZE.width + 'x' + PREVIEWS_SIZE.height
+    const rawCountQuery = getRawQuery('COUNT("Video"."id") as "total"')
+    const query = {
+      distinct: true,
+      offset: start,
+      limit: count,
+      order: [ getSort('createdAt'), [ 'Tags', 'name', 'ASC' ] ],
+      where: {
+        id: {
+          [Sequelize.Op.in]: Sequelize.literal('(' + rawQuery + ')')
+        }
+      },
+      include: [
+        {
+          model: VideoShareModel,
+          required: false,
+          where: {
+            [Sequelize.Op.and]: [
+              {
+                id: {
+                  [Sequelize.Op.not]: null
+                }
+              },
+              {
+                accountId
+              }
+            ]
+          },
+          include: [ AccountModel ]
+        },
+        {
+          model: VideoChannelModel,
+          required: true,
+          include: [
+            {
+              model: AccountModel,
+              required: true
+            }
+          ]
+        },
+        {
+          model: AccountVideoRateModel,
+          include: [ AccountModel ]
+        },
+        VideoFileModel,
+        TagModel
+      ]
+    }
-  return generateImageFromVideoFile(
+    return Bluebird.all([
-    this.getVideoFilePath(videoFile),
+      // FIXME: typing issue
-    CONFIG.STORAGE.PREVIEWS_DIR,
+      VideoModel.findAll(query as any),
-    this.getPreviewName(),
+      VideoModel.sequelize.query(rawCountQuery, { type: Sequelize.QueryTypes.SELECT })
-    imageSize
+    ]).then(([ rows, totals ]) => {
-  )
+      // totals: totalVideos + totalVideoShares
-}
+      let totalVideos = 0
+      let totalVideoShares = 0
+      if (totals[0]) totalVideos = parseInt(totals[0].total, 10)
+      if (totals[1]) totalVideoShares = parseInt(totals[1].total, 10)
+      const total = totalVideos + totalVideoShares
+      return {
+        data: rows,
+        total: total
+      }
+    })
+  }
-createThumbnail = function (this: VideoInstance, videoFile: VideoFileInstance) {
+  static listUserVideosForApi (userId: number, start: number, count: number, sort: string) {
-  const imageSize = THUMBNAILS_SIZE.width + 'x' + THUMBNAILS_SIZE.height
+    const query = {
+      distinct: true,
+      offset: start,
+      limit: count,
+      order: [ getSort(sort), [ 'Tags', 'name', 'ASC' ] ],
+      include: [
+        {
+          model: VideoChannelModel,
+          required: true,
+          include: [
+            {
+              model: AccountModel,
+              where: {
+                userId
+              },
+              required: true
+            }
+          ]
+        },
+        TagModel
+      ]
+    }
-  return generateImageFromVideoFile(
+    return VideoModel.findAndCountAll(query).then(({ rows, count }) => {
-    this.getVideoFilePath(videoFile),
+      return {
-    CONFIG.STORAGE.THUMBNAILS_DIR,
+        data: rows,
-    this.getThumbnailName(),
+        total: count
-    imageSize
+      }
-  )
+    })
-}
+  }
-getVideoFilePath = function (this: VideoInstance, videoFile: VideoFileInstance) {
+  static listForApi (start: number, count: number, sort: string) {
-  return join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile))
+    const query = {
-}
+      distinct: true,
+      offset: start,
+      limit: count,
+      order: [ getSort(sort), [ 'Tags', 'name', 'ASC' ] ],
+      include: [
+        {
+          model: VideoChannelModel,
+          required: true,
+          include: [
+            {
+              model: AccountModel,
+              required: true,
+              include: [
+                {
+                  model: ServerModel,
+                  required: false
+                }
+              ]
+            }
+          ]
+        },
+        TagModel
+      ],
+      where: this.createBaseVideosWhere()
+    }
-createTorrentAndSetInfoHash = async function (this: VideoInstance, videoFile: VideoFileInstance) {
+    return VideoModel.findAndCountAll(query).then(({ rows, count }) => {
-  const options = {
+      return {
-    announceList: [
+        data: rows,
-      [ CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT + '/tracker/socket' ]
+        total: count
-    ],
+      }
-    urlList: [
+    })
-      CONFIG.WEBSERVER.URL + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile)
-    ]
  }
-  const torrent = await createTorrentPromise(this.getVideoFilePath(videoFile), options)
+  static load (id: number) {
+    return VideoModel.findById(id)
+  }
-  const filePath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile))
+  static loadByUUID (uuid: string, t?: Sequelize.Transaction) {
-  logger.info('Creating torrent %s.', filePath)
+    const query: IFindOptions<VideoModel> = {
+      where: {
+        uuid
+      },
+      include: [ VideoFileModel ]
+    }
-  await writeFilePromise(filePath, torrent)
+    if (t !== undefined) query.transaction = t
-  const parsedTorrent = parseTorrent(torrent)
+    return VideoModel.findOne(query)
-  videoFile.infoHash = parsedTorrent.infoHash
+  }
-}
-getEmbedPath = function (this: VideoInstance) {
+  static loadByUrlAndPopulateAccount (url: string, t?: Sequelize.Transaction) {
-  return '/videos/embed/' + this.uuid
+    const query: IFindOptions<VideoModel> = {
-}
+      where: {
+        url
+      },
+      include: [
+        VideoFileModel,
+        {
+          model: VideoChannelModel,
+          include: [ AccountModel ]
+        }
+      ]
+    }
-getThumbnailPath = function (this: VideoInstance) {
+    if (t !== undefined) query.transaction = t
-  return join(STATIC_PATHS.THUMBNAILS, this.getThumbnailName())
-}
-getPreviewPath = function (this: VideoInstance) {
+    return VideoModel.findOne(query)
-  return join(STATIC_PATHS.PREVIEWS, this.getPreviewName())
+  }
-}
-toFormattedJSON = function (this: VideoInstance) {
+  static loadByUUIDOrURL (uuid: string, url: string, t?: Sequelize.Transaction) {
-  let serverHost
+    const query: IFindOptions<VideoModel> = {
+      where: {
+        [Sequelize.Op.or]: [
+          { uuid },
+          { url }
+        ]
+      },
+      include: [ VideoFileModel ]
+    }
-  if (this.VideoChannel.Account.Server) {
+    if (t !== undefined) query.transaction = t
-    serverHost = this.VideoChannel.Account.Server.host
-  } else {
-    // It means it's our video
-    serverHost = CONFIG.WEBSERVER.HOST
-  }
-  const json = {
+    return VideoModel.findOne(query)
-    id: this.id,
-    uuid: this.uuid,
-    name: this.name,
-    category: this.category,
-    categoryLabel: this.getCategoryLabel(),
-    licence: this.licence,
-    licenceLabel: this.getLicenceLabel(),
-    language: this.language,
-    languageLabel: this.getLanguageLabel(),
-    nsfw: this.nsfw,
-    description: this.getTruncatedDescription(),
-    serverHost,
-    isLocal: this.isOwned(),
-    accountName: this.VideoChannel.Account.name,
-    duration: this.duration,
-    views: this.views,
-    likes: this.likes,
-    dislikes: this.dislikes,
-    tags: map<TagInstance, string>(this.Tags, 'name'),
-    thumbnailPath: this.getThumbnailPath(),
-    previewPath: this.getPreviewPath(),
-    embedPath: this.getEmbedPath(),
-    createdAt: this.createdAt,
-    updatedAt: this.updatedAt
  }
-  return json
+  static loadAndPopulateAccountAndServerAndTags (id: number) {
-}
+    const options = {
+      order: [ [ 'Tags', 'name', 'ASC' ] ],
+      include: [
+        {
+          model: VideoChannelModel,
+          include: [
+            {
+              model: AccountModel,
+              include: [ { model: ServerModel, required: false } ]
+            }
+          ]
+        },
+        {
+          model: AccountVideoRateModel,
+          include: [ AccountModel ]
+        },
+        {
+          model: VideoShareModel,
+          include: [ AccountModel ]
+        },
+        TagModel,
+        VideoFileModel
+      ]
+    }
-toFormattedDetailsJSON = function (this: VideoInstance) {
+    return VideoModel.findById(id, options)
-  const formattedJson = this.toFormattedJSON()
+  }
-  // Maybe our server is not up to date and there are new privacy settings since our version
+  static loadByUUIDAndPopulateAccountAndServerAndTags (uuid: string) {
-  let privacyLabel = VIDEO_PRIVACIES[this.privacy]
+    const options = {
-  if (!privacyLabel) privacyLabel = 'Unknown'
+      order: [ [ 'Tags', 'name', 'ASC' ] ],
+      where: {
+        uuid
+      },
+      include: [
+        {
+          model: VideoChannelModel,
+          include: [
+            {
+              model: AccountModel,
+              include: [ { model: ServerModel, required: false } ]
+            }
+          ]
+        },
+        {
+          model: AccountVideoRateModel,
+          include: [ AccountModel ]
+        },
+        {
+          model: VideoShareModel,
+          include: [ AccountModel ]
+        },
+        TagModel,
+        VideoFileModel
+      ]
+    }
-  const detailsJson = {
+    return VideoModel.findOne(options)
-    privacyLabel,
-    privacy: this.privacy,
-    descriptionPath: this.getDescriptionPath(),
-    channel: this.VideoChannel.toFormattedJSON(),
-    account: this.VideoChannel.Account.toFormattedJSON(),
-    files: []
  }
-  // Format and sort video files
+  static searchAndPopulateAccountAndServerAndTags (value: string, start: number, count: number, sort: string) {
-  const { baseUrlHttp, baseUrlWs } = getBaseUrls(this)
+    const serverInclude: IIncludeOptions = {
-  detailsJson.files = this.VideoFiles
+      model: ServerModel,
-                   .map(videoFile => {
+      required: false
-                     let resolutionLabel = videoFile.resolution + 'p'
+    }
-                     const videoFileJson = {
-                       resolution: videoFile.resolution,
-                       resolutionLabel,
-                       magnetUri: generateMagnetUri(this, videoFile, baseUrlHttp, baseUrlWs),
-                       size: videoFile.size,
-                       torrentUrl: getTorrentUrl(this, videoFile, baseUrlHttp),
-                       fileUrl: getVideoFileUrl(this, videoFile, baseUrlHttp)
-                     }
-                     return videoFileJson
-                   })
-                   .sort((a, b) => {
-                     if (a.resolution < b.resolution) return 1
-                     if (a.resolution === b.resolution) return 0
-                     return -1
-                   })
-  return Object.assign(formattedJson, detailsJson)
-}
-toActivityPubObject = function (this: VideoInstance) {
-  const { baseUrlHttp, baseUrlWs } = getBaseUrls(this)
-  if (!this.Tags) this.Tags = []
-  const tag = this.Tags.map(t => ({
+    const accountInclude: IIncludeOptions = {
-    type: 'Hashtag' as 'Hashtag',
+      model: AccountModel,
-    name: t.name
+      include: [ serverInclude ]
-  }))
+    }
-  let language
+    const videoChannelInclude: IIncludeOptions = {
-  if (this.language) {
+      model: VideoChannelModel,
-    language = {
+      include: [ accountInclude ],
-      identifier: this.language + '',
+      required: true
-      name: this.getLanguageLabel()
    }
-  }
-  let category
+    const tagInclude: IIncludeOptions = {
-  if (this.category) {
+      model: TagModel
-    category = {
-      identifier: this.category + '',
-      name: this.getCategoryLabel()
    }
-  }
-  let licence
+    const query: IFindOptions<VideoModel> = {
-  if (this.licence) {
+      distinct: true,
-    licence = {
+      where: this.createBaseVideosWhere(),
-      identifier: this.licence + '',
+      offset: start,
-      name: this.getLicenceLabel()
+      limit: count,
+      order: [ getSort(sort), [ 'Tags', 'name', 'ASC' ] ]
    }
-  }
-  let likesObject
+    // TODO: search on tags too
-  let dislikesObject
+    // const escapedValue = Video['sequelize'].escape('%' + value + '%')
+    // query.where['id'][Sequelize.Op.in] = Video['sequelize'].literal(
+    //   `(SELECT "VideoTags"."videoId"
+    //     FROM "Tags"
+    //     INNER JOIN "VideoTags" ON "Tags"."id" = "VideoTags"."tagId"
+    //     WHERE name ILIKE ${escapedValue}
+    //    )`
+    // )
+    // TODO: search on account too
+    // accountInclude.where = {
+    //   name: {
+    //     [Sequelize.Op.iLike]: '%' + value + '%'
+    //   }
+    // }
+    query.where['name'] = {
+      [Sequelize.Op.iLike]: '%' + value + '%'
+    }
-  if (Array.isArray(this.AccountVideoRates)) {
+    query.include = [
-    const likes: string[] = []
+      videoChannelInclude, tagInclude
-    const dislikes: string[] = []
+    ]
-    for (const rate of this.AccountVideoRates) {
+    return VideoModel.findAndCountAll(query).then(({ rows, count }) => {
-      if (rate.type === 'like') {
+      return {
-        likes.push(rate.Account.url)
+        data: rows,
-      } else if (rate.type === 'dislike') {
+        total: count
-        dislikes.push(rate.Account.url)
      }
-    }
+    })
-    likesObject = activityPubCollection(likes)
-    dislikesObject = activityPubCollection(dislikes)
  }
-  let sharesObject
+  private static createBaseVideosWhere () {
-  if (Array.isArray(this.VideoShares)) {
+    return {
-    const shares: string[] = []
+      id: {
+        [Sequelize.Op.notIn]: VideoModel.sequelize.literal(
-    for (const videoShare of this.VideoShares) {
+          '(SELECT "videoBlacklist"."videoId" FROM "videoBlacklist")'
-      const shareUrl = getAnnounceActivityPubUrl(this.url, videoShare.Account)
+        )
-      shares.push(shareUrl)
+      },
+      privacy: VideoPrivacy.PUBLIC
    }
-    sharesObject = activityPubCollection(shares)
  }
-  const url = []
+  getOriginalFile () {
-  for (const file of this.VideoFiles) {
+    if (Array.isArray(this.VideoFiles) === false) return undefined
-    url.push({
-      type: 'Link',
-      mimeType: 'video/' + file.extname.replace('.', ''),
-      url: getVideoFileUrl(this, file, baseUrlHttp),
-      width: file.resolution,
-      size: file.size
-    })
-    url.push({
+    // The original file is the file that have the higher resolution
-      type: 'Link',
+    return maxBy(this.VideoFiles, file => file.resolution)
-      mimeType: 'application/x-bittorrent',
-      url: getTorrentUrl(this, file, baseUrlHttp),
-      width: file.resolution
-    })
-    url.push({
-      type: 'Link',
-      mimeType: 'application/x-bittorrent;x-scheme-handler/magnet',
-      url: generateMagnetUri(this, file, baseUrlHttp, baseUrlWs),
-      width: file.resolution
-    })
  }
-  // Add video url too
+  getVideoFilename (videoFile: VideoFileModel) {
-  url.push({
+    return this.uuid + '-' + videoFile.resolution + videoFile.extname
-    type: 'Link',
+  }
-    mimeType: 'text/html',
-    url: CONFIG.WEBSERVER.URL + '/videos/watch/' + this.uuid
-  })
-  const videoObject: VideoTorrentObject = {
+  getThumbnailName () {
-    type: 'Video' as 'Video',
+    // We always have a copy of the thumbnail
-    id: this.url,
+    const extension = '.jpg'
-    name: this.name,
+    return this.uuid + extension
-    // https://www.w3.org/TR/activitystreams-vocabulary/#dfn-duration
-    duration: 'PT' + this.duration + 'S',
-    uuid: this.uuid,
-    tag,
-    category,
-    licence,
-    language,
-    views: this.views,
-    nsfw: this.nsfw,
-    published: this.createdAt.toISOString(),
-    updated: this.updatedAt.toISOString(),
-    mediaType: 'text/markdown',
-    content: this.getTruncatedDescription(),
-    icon: {
-      type: 'Image',
-      url: getThumbnailUrl(this, baseUrlHttp),
-      mediaType: 'image/jpeg',
-      width: THUMBNAILS_SIZE.width,
-      height: THUMBNAILS_SIZE.height
-    },
-    url,
-    likes: likesObject,
-    dislikes: dislikesObject,
-    shares: sharesObject
  }
-  return videoObject
+  getPreviewName () {
-}
+    const extension = '.jpg'
+    return this.uuid + extension
+  }
-getTruncatedDescription = function (this: VideoInstance) {
+  getTorrentFileName (videoFile: VideoFileModel) {
-  if (!this.description) return null
+    const extension = '.torrent'
+    return this.uuid + '-' + videoFile.resolution + extension
+  }
-  const options = {
+  isOwned () {
-    length: CONSTRAINTS_FIELDS.VIDEOS.TRUNCATED_DESCRIPTION.max
+    return this.remote === false
  }
-  return truncate(this.description, options)
+  createPreview (videoFile: VideoFileModel) {
-}
+    const imageSize = PREVIEWS_SIZE.width + 'x' + PREVIEWS_SIZE.height
+    return generateImageFromVideoFile(
+      this.getVideoFilePath(videoFile),
+      CONFIG.STORAGE.PREVIEWS_DIR,
+      this.getPreviewName(),
+      imageSize
+    )
+  }
-optimizeOriginalVideofile = async function (this: VideoInstance) {
+  createThumbnail (videoFile: VideoFileModel) {
-  const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
+    const imageSize = THUMBNAILS_SIZE.width + 'x' + THUMBNAILS_SIZE.height
-  const newExtname = '.mp4'
-  const inputVideoFile = this.getOriginalFile()
-  const videoInputPath = join(videosDirectory, this.getVideoFilename(inputVideoFile))
-  const videoOutputPath = join(videosDirectory, this.id + '-transcoded' + newExtname)
-  const transcodeOptions = {
+    return generateImageFromVideoFile(
-    inputPath: videoInputPath,
+      this.getVideoFilePath(videoFile),
-    outputPath: videoOutputPath
+      CONFIG.STORAGE.THUMBNAILS_DIR,
+      this.getThumbnailName(),
+      imageSize
+    )
  }
-  try {
+  getVideoFilePath (videoFile: VideoFileModel) {
-    // Could be very long!
+    return join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile))
-    await transcode(transcodeOptions)
+  }
-    await unlinkPromise(videoInputPath)
+  createTorrentAndSetInfoHash = async function (videoFile: VideoFileModel) {
+    const options = {
+      announceList: [
+        [ CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT + '/tracker/socket' ]
+      ],
+      urlList: [
+        CONFIG.WEBSERVER.URL + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile)
+      ]
+    }
-    // Important to do this before getVideoFilename() to take in account the new file extension
+    const torrent = await createTorrentPromise(this.getVideoFilePath(videoFile), options)
-    inputVideoFile.set('extname', newExtname)
-    await renamePromise(videoOutputPath, this.getVideoFilePath(inputVideoFile))
+    const filePath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile))
-    const stats = await statPromise(this.getVideoFilePath(inputVideoFile))
+    logger.info('Creating torrent %s.', filePath)
-    inputVideoFile.set('size', stats.size)
+    await writeFilePromise(filePath, torrent)
-    await this.createTorrentAndSetInfoHash(inputVideoFile)
+    const parsedTorrent = parseTorrent(torrent)
-    await inputVideoFile.save()
+    videoFile.infoHash = parsedTorrent.infoHash
+  }
-  } catch (err) {
+  getEmbedPath () {
-    // Auto destruction...
+    return '/videos/embed/' + this.uuid
-    this.destroy().catch(err => logger.error('Cannot destruct video after transcoding failure.', err))
+  }
-    throw err
+  getThumbnailPath () {
+    return join(STATIC_PATHS.THUMBNAILS, this.getThumbnailName())
  }
-}
-transcodeOriginalVideofile = async function (this: VideoInstance, resolution: VideoResolution) {
+  getPreviewPath () {
-  const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
+    return join(STATIC_PATHS.PREVIEWS, this.getPreviewName())
-  const extname = '.mp4'
+  }
-  // We are sure it's x264 in mp4 because optimizeOriginalVideofile was already executed
+  toFormattedJSON () {
-  const videoInputPath = join(videosDirectory, this.getVideoFilename(this.getOriginalFile()))
+    let serverHost
-  const newVideoFile = (Video['sequelize'].models.VideoFile as VideoFileModel).build({
+    if (this.VideoChannel.Account.Server) {
-    resolution,
+      serverHost = this.VideoChannel.Account.Server.host
-    extname,
+    } else {
-    size: 0,
+      // It means it's our video
-    videoId: this.id
+      serverHost = CONFIG.WEBSERVER.HOST
-  })
+    }
-  const videoOutputPath = join(videosDirectory, this.getVideoFilename(newVideoFile))
-  const transcodeOptions = {
+    return {
-    inputPath: videoInputPath,
+      id: this.id,
-    outputPath: videoOutputPath,
+      uuid: this.uuid,
-    resolution
+      name: this.name,
+      category: this.category,
+      categoryLabel: this.getCategoryLabel(),
+      licence: this.licence,
+      licenceLabel: this.getLicenceLabel(),
+      language: this.language,
+      languageLabel: this.getLanguageLabel(),
+      nsfw: this.nsfw,
+      description: this.getTruncatedDescription(),
+      serverHost,
+      isLocal: this.isOwned(),
+      accountName: this.VideoChannel.Account.name,
+      duration: this.duration,
+      views: this.views,
+      likes: this.likes,
+      dislikes: this.dislikes,
+      tags: map<TagModel, string>(this.Tags, 'name'),
+      thumbnailPath: this.getThumbnailPath(),
+      previewPath: this.getPreviewPath(),
+      embedPath: this.getEmbedPath(),
+      createdAt: this.createdAt,
+      updatedAt: this.updatedAt
+    }
  }
-  await transcode(transcodeOptions)
+  toFormattedDetailsJSON () {
+    const formattedJson = this.toFormattedJSON()
-  const stats = await statPromise(videoOutputPath)
+    // Maybe our server is not up to date and there are new privacy settings since our version
+    let privacyLabel = VIDEO_PRIVACIES[this.privacy]
+    if (!privacyLabel) privacyLabel = 'Unknown'
-  newVideoFile.set('size', stats.size)
+    const detailsJson = {
+      privacyLabel,
+      privacy: this.privacy,
+      descriptionPath: this.getDescriptionPath(),
+      channel: this.VideoChannel.toFormattedJSON(),
+      account: this.VideoChannel.Account.toFormattedJSON(),
+      files: []
+    }
-  await this.createTorrentAndSetInfoHash(newVideoFile)
+    // Format and sort video files
+    const { baseUrlHttp, baseUrlWs } = this.getBaseUrls()
+    detailsJson.files = this.VideoFiles
+      .map(videoFile => {
+        let resolutionLabel = videoFile.resolution + 'p'
+        return {
+          resolution: videoFile.resolution,
+          resolutionLabel,
+          magnetUri: this.generateMagnetUri(videoFile, baseUrlHttp, baseUrlWs),
+          size: videoFile.size,
+          torrentUrl: this.getTorrentUrl(videoFile, baseUrlHttp),
+          fileUrl: this.getVideoFileUrl(videoFile, baseUrlHttp)
+        }
+      })
+      .sort((a, b) => {
+        if (a.resolution < b.resolution) return 1
+        if (a.resolution === b.resolution) return 0
+        return -1
+      })
+    return Object.assign(formattedJson, detailsJson)
+  }
-  await newVideoFile.save()
+  toActivityPubObject (): VideoTorrentObject {
+    const { baseUrlHttp, baseUrlWs } = this.getBaseUrls()
+    if (!this.Tags) this.Tags = []
-  this.VideoFiles.push(newVideoFile)
+    const tag = this.Tags.map(t => ({
-}
+      type: 'Hashtag' as 'Hashtag',
+      name: t.name
+    }))
-getOriginalFileHeight = function (this: VideoInstance) {
+    let language
-  const originalFilePath = this.getVideoFilePath(this.getOriginalFile())
+    if (this.language) {
+      language = {
+        identifier: this.language + '',
+        name: this.getLanguageLabel()
+      }
+    }
-  return getVideoFileHeight(originalFilePath)
+    let category
-}
+    if (this.category) {
+      category = {
+        identifier: this.category + '',
+        name: this.getCategoryLabel()
+      }
+    }
-getDescriptionPath = function (this: VideoInstance) {
+    let licence
-  return `/api/${API_VERSION}/videos/${this.uuid}/description`
+    if (this.licence) {
-}
+      licence = {
+        identifier: this.licence + '',
+        name: this.getLicenceLabel()
+      }
+    }
-getCategoryLabel = function (this: VideoInstance) {
+    let likesObject
-  let categoryLabel = VIDEO_CATEGORIES[this.category]
+    let dislikesObject
-  if (!categoryLabel) categoryLabel = 'Misc'
-  return categoryLabel
+    if (Array.isArray(this.AccountVideoRates)) {
-}
+      const likes: string[] = []
+      const dislikes: string[] = []
-getLicenceLabel = function (this: VideoInstance) {
+      for (const rate of this.AccountVideoRates) {
-  let licenceLabel = VIDEO_LICENCES[this.licence]
+        if (rate.type === 'like') {
-  if (!licenceLabel) licenceLabel = 'Unknown'
+          likes.push(rate.Account.url)
+        } else if (rate.type === 'dislike') {
+          dislikes.push(rate.Account.url)
+        }
+      }
-  return licenceLabel
+      likesObject = activityPubCollection(likes)
-}
+      dislikesObject = activityPubCollection(dislikes)
+    }
-getLanguageLabel = function (this: VideoInstance) {
+    let sharesObject
-  let languageLabel = VIDEO_LANGUAGES[this.language]
+    if (Array.isArray(this.VideoShares)) {
-  if (!languageLabel) languageLabel = 'Unknown'
+      const shares: string[] = []
-  return languageLabel
+      for (const videoShare of this.VideoShares) {
-}
+        const shareUrl = getAnnounceActivityPubUrl(this.url, videoShare.Account)
+        shares.push(shareUrl)
+      }
-removeThumbnail = function (this: VideoInstance) {
+      sharesObject = activityPubCollection(shares)
-  const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, this.getThumbnailName())
+    }
-  return unlinkPromise(thumbnailPath)
-}
-removePreview = function (this: VideoInstance) {
+    const url = []
-  // Same name than video thumbnail
+    for (const file of this.VideoFiles) {
-  return unlinkPromise(CONFIG.STORAGE.PREVIEWS_DIR + this.getPreviewName())
+      url.push({
-}
+        type: 'Link',
+        mimeType: 'video/' + file.extname.replace('.', ''),
+        url: this.getVideoFileUrl(file, baseUrlHttp),
+        width: file.resolution,
+        size: file.size
+      })
+      url.push({
+        type: 'Link',
+        mimeType: 'application/x-bittorrent',
+        url: this.getTorrentUrl(file, baseUrlHttp),
+        width: file.resolution
+      })
+      url.push({
+        type: 'Link',
+        mimeType: 'application/x-bittorrent;x-scheme-handler/magnet',
+        url: this.generateMagnetUri(file, baseUrlHttp, baseUrlWs),
+        width: file.resolution
+      })
+    }
-removeFile = function (this: VideoInstance, videoFile: VideoFileInstance) {
+    // Add video url too
-  const filePath = join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile))
+    url.push({
-  return unlinkPromise(filePath)
+      type: 'Link',
-}
+      mimeType: 'text/html',
+      url: CONFIG.WEBSERVER.URL + '/videos/watch/' + this.uuid
+    })
-removeTorrent = function (this: VideoInstance, videoFile: VideoFileInstance) {
+    return {
-  const torrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile))
+      type: 'Video' as 'Video',
-  return unlinkPromise(torrentPath)
+      id: this.url,
-}
+      name: this.name,
+      // https://www.w3.org/TR/activitystreams-vocabulary/#dfn-duration
+      duration: 'PT' + this.duration + 'S',
+      uuid: this.uuid,
+      tag,
+      category,
+      licence,
+      language,
+      views: this.views,
+      nsfw: this.nsfw,
+      published: this.createdAt.toISOString(),
+      updated: this.updatedAt.toISOString(),
+      mediaType: 'text/markdown',
+      content: this.getTruncatedDescription(),
+      icon: {
+        type: 'Image',
+        url: this.getThumbnailUrl(baseUrlHttp),
+        mediaType: 'image/jpeg',
+        width: THUMBNAILS_SIZE.width,
+        height: THUMBNAILS_SIZE.height
+      },
+      url,
+      likes: likesObject,
+      dislikes: dislikesObject,
+      shares: sharesObject
+    }
+  }
+  getTruncatedDescription () {
+    if (!this.description) return null
-// ------------------------------ STATICS ------------------------------
+    const options = {
+      length: CONSTRAINTS_FIELDS.VIDEOS.TRUNCATED_DESCRIPTION.max
+    }
-list = function () {
+    return truncate(this.description, options)
-  const query = {
-    include: [ Video['sequelize'].models.VideoFile ]
  }
-  return Video.findAll(query)
+  optimizeOriginalVideofile = async function () {
-}
+    const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
+    const newExtname = '.mp4'
+    const inputVideoFile = this.getOriginalFile()
+    const videoInputPath = join(videosDirectory, this.getVideoFilename(inputVideoFile))
+    const videoOutputPath = join(videosDirectory, this.id + '-transcoded' + newExtname)
-listAllAndSharedByAccountForOutbox = function (accountId: number, start: number, count: number) {
+    const transcodeOptions = {
-  function getRawQuery (select: string) {
+      inputPath: videoInputPath,
-    const queryVideo = 'SELECT ' + select + ' FROM "Videos" AS "Video" ' +
+      outputPath: videoOutputPath
-      'INNER JOIN "VideoChannels" AS "VideoChannel" ON "VideoChannel"."id" = "Video"."channelId" ' +
+    }
-      'WHERE "VideoChannel"."accountId" = ' + accountId
-    const queryVideoShare = 'SELECT ' + select + ' FROM "VideoShares" AS "VideoShare" ' +
-      'INNER JOIN "Videos" AS "Video" ON "Video"."id" = "VideoShare"."videoId" ' +
-      'WHERE "VideoShare"."accountId" = ' + accountId
-    let rawQuery = `(${queryVideo}) UNION (${queryVideoShare})`
+    try {
+      // Could be very long!
+      await transcode(transcodeOptions)
-    return rawQuery
+      await unlinkPromise(videoInputPath)
-  }
-  const rawQuery = getRawQuery('"Video"."id"')
+      // Important to do this before getVideoFilename() to take in account the new file extension
-  const rawCountQuery = getRawQuery('COUNT("Video"."id") as "total"')
+      inputVideoFile.set('extname', newExtname)
-  const query = {
+      await renamePromise(videoOutputPath, this.getVideoFilePath(inputVideoFile))
-    distinct: true,
+      const stats = await statPromise(this.getVideoFilePath(inputVideoFile))
-    offset: start,
-    limit: count,
-    order: [ getSort('createdAt'), [ Video['sequelize'].models.Tag, 'name', 'ASC' ] ],
-    where: {
-      id: {
-        [Sequelize.Op.in]: Sequelize.literal('(' + rawQuery + ')')
-      }
-    },
-    include: [
-      {
-        model: Video['sequelize'].models.VideoShare,
-        required: false,
-        where: {
-          [Sequelize.Op.and]: [
-            {
-              id: {
-                [Sequelize.Op.not]: null
-              }
-            },
-            {
-              accountId
-            }
-          ]
-        },
-        include: [ Video['sequelize'].models.Account ]
-      },
-      {
-        model: Video['sequelize'].models.VideoChannel,
-        required: true,
-        include: [
-          {
-            model: Video['sequelize'].models.Account,
-            required: true
-          }
-        ]
-      },
-      {
-        model: Video['sequelize'].models.AccountVideoRate,
-        include: [ Video['sequelize'].models.Account ]
-      },
-      Video['sequelize'].models.VideoFile,
-      Video['sequelize'].models.Tag
-    ]
-  }
-  return Bluebird.all([
+      inputVideoFile.set('size', stats.size)
-    Video.findAll(query),
-    Video['sequelize'].query(rawCountQuery, { type: Sequelize.QueryTypes.SELECT })
-  ]).then(([ rows, totals ]) => {
-    // totals: totalVideos + totalVideoShares
-    let totalVideos = 0
-    let totalVideoShares = 0
-    if (totals[0]) totalVideos = parseInt(totals[0].total, 10)
-    if (totals[1]) totalVideoShares = parseInt(totals[1].total, 10)
-    const total = totalVideos + totalVideoShares
-    return {
-      data: rows,
-      total: total
-    }
-  })
-}
-listUserVideosForApi = function (userId: number, start: number, count: number, sort: string) {
+      await this.createTorrentAndSetInfoHash(inputVideoFile)
-  const query = {
+      await inputVideoFile.save()
-    distinct: true,
-    offset: start,
-    limit: count,
-    order: [ getSort(sort), [ Video['sequelize'].models.Tag, 'name', 'ASC' ] ],
-    include: [
-      {
-        model: Video['sequelize'].models.VideoChannel,
-        required: true,
-        include: [
-          {
-            model: Video['sequelize'].models.Account,
-            where: {
-              userId
-            },
-            required: true
-          }
-        ]
-      },
-      Video['sequelize'].models.Tag
-    ]
-  }
-  return Video.findAndCountAll(query).then(({ rows, count }) => {
+    } catch (err) {
-    return {
+      // Auto destruction...
-      data: rows,
+      this.destroy().catch(err => logger.error('Cannot destruct video after transcoding failure.', err))
-      total: count
-    }
-  })
-}
-listForApi = function (start: number, count: number, sort: string) {
+      throw err
-  const query = {
+    }
-    distinct: true,
-    offset: start,
-    limit: count,
-    order: [ getSort(sort), [ Video['sequelize'].models.Tag, 'name', 'ASC' ] ],
-    include: [
-      {
-        model: Video['sequelize'].models.VideoChannel,
-        required: true,
-        include: [
-          {
-            model: Video['sequelize'].models.Account,
-            required: true,
-            include: [
-              {
-                model: Video['sequelize'].models.Server,
-                required: false
-              }
-            ]
-          }
-        ]
-      },
-      Video['sequelize'].models.Tag
-    ],
-    where: createBaseVideosWhere()
  }
-  return Video.findAndCountAll(query).then(({ rows, count }) => {
+  transcodeOriginalVideofile = async function (resolution: VideoResolution) {
-    return {
+    const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
-      data: rows,
+    const extname = '.mp4'
-      total: count
-    }
-  })
-}
-load = function (id: number) {
+    // We are sure it's x264 in mp4 because optimizeOriginalVideofile was already executed
-  return Video.findById(id)
+    const videoInputPath = join(videosDirectory, this.getVideoFilename(this.getOriginalFile()))
-}
-loadByUUID = function (uuid: string, t?: Sequelize.Transaction) {
+    const newVideoFile = new VideoFileModel({
-  const query: Sequelize.FindOptions<VideoAttributes> = {
+      resolution,
-    where: {
+      extname,
-      uuid
+      size: 0,
-    },
+      videoId: this.id
-    include: [ Video['sequelize'].models.VideoFile ]
+    })
-  }
+    const videoOutputPath = join(videosDirectory, this.getVideoFilename(newVideoFile))
-  if (t !== undefined) query.transaction = t
+    const transcodeOptions = {
+      inputPath: videoInputPath,
+      outputPath: videoOutputPath,
+      resolution
+    }
-  return Video.findOne(query)
+    await transcode(transcodeOptions)
-}
-loadByUrlAndPopulateAccount = function (url: string, t?: Sequelize.Transaction) {
+    const stats = await statPromise(videoOutputPath)
-  const query: Sequelize.FindOptions<VideoAttributes> = {
-    where: {
-      url
-    },
-    include: [
-      Video['sequelize'].models.VideoFile,
-      {
-        model: Video['sequelize'].models.VideoChannel,
-        include: [ Video['sequelize'].models.Account ]
-      }
-    ]
-  }
-  if (t !== undefined) query.transaction = t
+    newVideoFile.set('size', stats.size)
-  return Video.findOne(query)
+    await this.createTorrentAndSetInfoHash(newVideoFile)
-}
-loadByUUIDOrURL = function (uuid: string, url: string, t?: Sequelize.Transaction) {
+    await newVideoFile.save()
-  const query: Sequelize.FindOptions<VideoAttributes> = {
-    where: {
+    this.VideoFiles.push(newVideoFile)
-      [Sequelize.Op.or]: [
-        { uuid },
-        { url }
-      ]
-    },
-    include: [ Video['sequelize'].models.VideoFile ]
  }
-  if (t !== undefined) query.transaction = t
+  getOriginalFileHeight () {
+    const originalFilePath = this.getVideoFilePath(this.getOriginalFile())
-  return Video.findOne(query)
+    return getVideoFileHeight(originalFilePath)
-}
+  }
-loadAndPopulateAccountAndServerAndTags = function (id: number) {
+  getDescriptionPath () {
-  const options = {
+    return `/api/${API_VERSION}/videos/${this.uuid}/description`
-    order: [ [ Video['sequelize'].models.Tag, 'name', 'ASC' ] ],
-    include: [
-      {
-        model: Video['sequelize'].models.VideoChannel,
-        include: [
-          {
-            model: Video['sequelize'].models.Account,
-            include: [ { model: Video['sequelize'].models.Server, required: false } ]
-          }
-        ]
-      },
-      {
-        model: Video['sequelize'].models.AccountVideoRate,
-        include: [ Video['sequelize'].models.Account ]
-      },
-      {
-        model: Video['sequelize'].models.VideoShare,
-        include: [ Video['sequelize'].models.Account ]
-      },
-      Video['sequelize'].models.Tag,
-      Video['sequelize'].models.VideoFile
-    ]
  }
-  return Video.findById(id, options)
+  getCategoryLabel () {
-}
+    let categoryLabel = VIDEO_CATEGORIES[this.category]
+    if (!categoryLabel) categoryLabel = 'Misc'
-loadByUUIDAndPopulateAccountAndServerAndTags = function (uuid: string) {
+    return categoryLabel
-  const options = {
-    order: [ [ Video['sequelize'].models.Tag, 'name', 'ASC' ] ],
-    where: {
-      uuid
-    },
-    include: [
-      {
-        model: Video['sequelize'].models.VideoChannel,
-        include: [
-          {
-            model: Video['sequelize'].models.Account,
-            include: [ { model: Video['sequelize'].models.Server, required: false } ]
-          }
-        ]
-      },
-      {
-        model: Video['sequelize'].models.AccountVideoRate,
-        include: [ Video['sequelize'].models.Account ]
-      },
-      {
-        model: Video['sequelize'].models.VideoShare,
-        include: [ Video['sequelize'].models.Account ]
-      },
-      Video['sequelize'].models.Tag,
-      Video['sequelize'].models.VideoFile
-    ]
  }
-  return Video.findOne(options)
+  getLicenceLabel () {
-}
+    let licenceLabel = VIDEO_LICENCES[this.licence]
+    if (!licenceLabel) licenceLabel = 'Unknown'
-searchAndPopulateAccountAndServerAndTags = function (value: string, start: number, count: number, sort: string) {
+    return licenceLabel
-  const serverInclude: Sequelize.IncludeOptions = {
-    model: Video['sequelize'].models.Server,
-    required: false
  }
-  const accountInclude: Sequelize.IncludeOptions = {
+  getLanguageLabel () {
-    model: Video['sequelize'].models.Account,
+    let languageLabel = VIDEO_LANGUAGES[this.language]
-    include: [ serverInclude ]
+    if (!languageLabel) languageLabel = 'Unknown'
+    return languageLabel
  }
-  const videoChannelInclude: Sequelize.IncludeOptions = {
+  removeThumbnail () {
-    model: Video['sequelize'].models.VideoChannel,
+    const thumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, this.getThumbnailName())
-    include: [ accountInclude ],
+    return unlinkPromise(thumbnailPath)
-    required: true
  }
-  const tagInclude: Sequelize.IncludeOptions = {
+  removePreview () {
-    model: Video['sequelize'].models.Tag
+    // Same name than video thumbnail
+    return unlinkPromise(CONFIG.STORAGE.PREVIEWS_DIR + this.getPreviewName())
  }
-  const query: Sequelize.FindOptions<VideoAttributes> = {
+  removeFile (videoFile: VideoFileModel) {
-    distinct: true,
+    const filePath = join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile))
-    where: createBaseVideosWhere(),
+    return unlinkPromise(filePath)
-    offset: start,
-    limit: count,
-    order: [ getSort(sort), [ Video['sequelize'].models.Tag, 'name', 'ASC' ] ]
  }
-  // TODO: search on tags too
+  removeTorrent (videoFile: VideoFileModel) {
-  // const escapedValue = Video['sequelize'].escape('%' + value + '%')
+    const torrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile))
-  // query.where['id'][Sequelize.Op.in] = Video['sequelize'].literal(
+    return unlinkPromise(torrentPath)
-  //   `(SELECT "VideoTags"."videoId"
-  //     FROM "Tags"
-  //     INNER JOIN "VideoTags" ON "Tags"."id" = "VideoTags"."tagId"
-  //     WHERE name ILIKE ${escapedValue}
-  //    )`
-  // )
-  // TODO: search on account too
-  // accountInclude.where = {
-  //   name: {
-  //     [Sequelize.Op.iLike]: '%' + value + '%'
-  //   }
-  // }
-  query.where['name'] = {
-    [Sequelize.Op.iLike]: '%' + value + '%'
  }
-  query.include = [
+  private getBaseUrls () {
-    videoChannelInclude, tagInclude
+    let baseUrlHttp
-  ]
+    let baseUrlWs
-  return Video.findAndCountAll(query).then(({ rows, count }) => {
+    if (this.isOwned()) {
-    return {
+      baseUrlHttp = CONFIG.WEBSERVER.URL
-      data: rows,
+      baseUrlWs = CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
-      total: count
+    } else {
+      baseUrlHttp = REMOTE_SCHEME.HTTP + '://' + this.VideoChannel.Account.Server.host
+      baseUrlWs = REMOTE_SCHEME.WS + '://' + this.VideoChannel.Account.Server.host
    }
-  })
-}
-// ---------------------------------------------------------------------------
-function createBaseVideosWhere () {
+    return { baseUrlHttp, baseUrlWs }
-  return {
-    id: {
-      [Sequelize.Op.notIn]: Video['sequelize'].literal(
-        '(SELECT "BlacklistedVideos"."videoId" FROM "BlacklistedVideos")'
-      )
-    },
-    privacy: VideoPrivacy.PUBLIC
  }
-}
-function getBaseUrls (video: VideoInstance) {
+  private getThumbnailUrl (baseUrlHttp: string) {
-  let baseUrlHttp
+    return baseUrlHttp + STATIC_PATHS.THUMBNAILS + this.getThumbnailName()
-  let baseUrlWs
-  if (video.isOwned()) {
-    baseUrlHttp = CONFIG.WEBSERVER.URL
-    baseUrlWs = CONFIG.WEBSERVER.WS + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
-  } else {
-    baseUrlHttp = REMOTE_SCHEME.HTTP + '://' + video.VideoChannel.Account.Server.host
-    baseUrlWs = REMOTE_SCHEME.WS + '://' + video.VideoChannel.Account.Server.host
  }
-  return { baseUrlHttp, baseUrlWs }
+  private getTorrentUrl (videoFile: VideoFileModel, baseUrlHttp: string) {
-}
+    return baseUrlHttp + STATIC_PATHS.TORRENTS + this.getTorrentFileName(videoFile)
+  }
-function getThumbnailUrl (video: VideoInstance, baseUrlHttp: string) {
-  return baseUrlHttp + STATIC_PATHS.THUMBNAILS + video.getThumbnailName()
-}
-function getTorrentUrl (video: VideoInstance, videoFile: VideoFileInstance, baseUrlHttp: string) {
+  private getVideoFileUrl (videoFile: VideoFileModel, baseUrlHttp: string) {
-  return baseUrlHttp + STATIC_PATHS.TORRENTS + video.getTorrentFileName(videoFile)
+    return baseUrlHttp + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile)
-}
+  }
-function getVideoFileUrl (video: VideoInstance, videoFile: VideoFileInstance, baseUrlHttp: string) {
+  private generateMagnetUri (videoFile: VideoFileModel, baseUrlHttp: string, baseUrlWs: string) {
-  return baseUrlHttp + STATIC_PATHS.WEBSEED + video.getVideoFilename(videoFile)
+    const xs = this.getTorrentUrl(videoFile, baseUrlHttp)
-}
+    const announce = [ baseUrlWs + '/tracker/socket', baseUrlHttp + '/tracker/announce' ]
+    const urlList = [ this.getVideoFileUrl(videoFile, baseUrlHttp) ]
+    const magnetHash = {
+      xs,
+      announce,
+      urlList,
+      infoHash: videoFile.infoHash,
+      name: this.name
+    }
-function generateMagnetUri (video: VideoInstance, videoFile: VideoFileInstance, baseUrlHttp: string, baseUrlWs: string) {
+    return magnetUtil.encode(magnetHash)
-  const xs = getTorrentUrl(video, videoFile, baseUrlHttp)
-  const announce = [ baseUrlWs + '/tracker/socket', baseUrlHttp + '/tracker/announce' ]
-  const urlList = [ getVideoFileUrl(video, videoFile, baseUrlHttp) ]
-  const magnetHash = {
-    xs,
-    announce,
-    urlList,
-    infoHash: videoFile.infoHash,
-    name: video.name
  }
-  return magnetUtil.encode(magnetHash)
 }
diff --git a/shared/models/users/user-role.ts b/shared/models/users/user-role.ts
index 954fa426e..cc32c768d 100644
--- a/shared/models/users/user-role.ts
+++ b/shared/models/users/user-role.ts
@@ -1,5 +1,4 @@
 import { UserRight } from './user-right.enum'
-import user from '../../../server/models/account/user'
 // Keep the order
 export enum UserRole {
diff --git a/tsconfig.json b/tsconfig.json
index be910b309..71674e165 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,13 +1,17 @@
 {
  "compilerOptions": {
    "module": "commonjs",
-    "target": "es5",
+    "target": "es2015",
    "noImplicitAny": false,
    "sourceMap": false,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
    "outDir": "./dist",
    "lib": [
      "dom",
-      "es2015"
+      "es2015",
+      "es2016",
+      "es2017"
    ],
    "types": [
      "node"
diff --git a/yarn.lock b/yarn.lock
index 986a1643a..cdf224c5c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,7 +16,7 @@
  dependencies:
    "@types/node" "*"
-"@types/bluebird@*":
+"@types/bluebird@*", "@types/bluebird@3.5.18":
  version "3.5.18"
  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.18.tgz#6a60435d4663e290f3709898a4f75014f279c4d6"
@@ -111,6 +111,10 @@
  version "8.0.53"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.53.tgz#396b35af826fa66aad472c8cb7b8d5e277f4e6d8"
+"@types/node@6.0.41":
+  version "6.0.41"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.41.tgz#578cf53aaec65887bcaf16792f8722932e8ff8ea"
 "@types/parse-torrent-file@*":
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/@types/parse-torrent-file/-/parse-torrent-file-4.0.1.tgz#056a6c18f3fac0cd7c6c74540f00496a3225976b"
@@ -129,6 +133,10 @@
  version "1.9.3"
  resolved "https://registry.yarnpkg.com/@types/pem/-/pem-1.9.3.tgz#0c864c8b79e43fef6367db895f60fd1edd10e86c"
+"@types/reflect-metadata@0.0.4":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/@types/reflect-metadata/-/reflect-metadata-0.0.4.tgz#b6477ca9a97e5265f2ac67f9ea704eae5e0eaf4d"
 "@types/request@^2.0.3":
  version "2.0.8"
  resolved "https://registry.yarnpkg.com/@types/request/-/request-2.0.8.tgz#424d3de255868107ed4dd6695c65c5f1766aba80"
@@ -136,7 +144,7 @@
    "@types/form-data" "*"
    "@types/node" "*"
-"@types/sequelize@^4.0.55":
+"@types/sequelize@4.0.79", "@types/sequelize@^4.0.55":
  version "4.0.79"
  resolved "https://registry.yarnpkg.com/@types/sequelize/-/sequelize-4.0.79.tgz#74c366407a978e493e70d7cea3d80c681aed15c0"
  dependencies:
@@ -1303,6 +1311,10 @@ es6-set@~0.1.5:
    es6-symbol "3.1.1"
    event-emitter "~0.3.5"
+es6-shim@0.35.3:
+  version "0.35.3"
+  resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.3.tgz#9bfb7363feffff87a6cdb6cd93e405ec3c4b6f26"
 es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
@@ -3451,6 +3463,10 @@ rechoir@^0.6.2:
  dependencies:
    resolve "^1.1.6"
+reflect-metadata@^0.1.10:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.10.tgz#b4f83704416acad89988c9b15635d47e03b9344a"
 regex-cache@^0.4.2:
  version "0.4.4"
  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
@@ -3661,6 +3677,17 @@ send@0.16.1:
    range-parser "~1.2.0"
    statuses "~1.3.1"
+sequelize-typescript@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/sequelize-typescript/-/sequelize-typescript-0.6.1.tgz#603c948183aebb534dbea182258ee6b0d0571bcb"
+  dependencies:
+    "@types/bluebird" "3.5.18"
+    "@types/node" "6.0.41"
+    "@types/reflect-metadata" "0.0.4"
+    "@types/sequelize" "4.0.79"
+    es6-shim "0.35.3"
+    glob "7.1.2"
 sequelize@^4.7.5:
  version "4.23.1"
  resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-4.23.1.tgz#2ec517bbb2ccddece45f934ef3c770cfbe818a8b"