diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index 6e8f1a07f..df31c3134 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -1,7 +1,7 @@
 import * as cors from 'cors'
 import { createReadStream } from 'fs-extra'
 import * as express from 'express'
-import { CONFIG, STATIC_DOWNLOAD_PATHS, STATIC_MAX_AGE, STATIC_PATHS, ROUTE_CACHE_LIFETIME } from '../initializers'
+import { CONFIG, ROUTE_CACHE_LIFETIME, STATIC_DOWNLOAD_PATHS, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers'
 import { VideosPreviewCache } from '../lib/cache'
 import { cacheRoute } from '../middlewares/cache'
 import { asyncMiddleware, videosGetValidator } from '../middlewares'
@@ -9,7 +9,7 @@ import { VideoModel } from '../models/video/video'
 import { VideosCaptionCache } from '../lib/cache/videos-caption-cache'
 import { UserModel } from '../models/account/user'
 import { VideoCommentModel } from '../models/video/video-comment'
-import { HttpNodeinfoDiasporaSoftwareNsSchema20 } from '../models/nodeinfo'
+import { HttpNodeinfoDiasporaSoftwareNsSchema20 } from '../../shared/models/nodeinfo'
 
 const packageJSON = require('../../../package.json')
 const staticRouter = express.Router()
diff --git a/server/models/migrations/index.ts b/server/models/migrations.ts
similarity index 100%
rename from server/models/migrations/index.ts
rename to server/models/migrations.ts
diff --git a/server/models/nodeinfo/index.d.ts b/shared/models/nodeinfo/index.d.ts
similarity index 100%
rename from server/models/nodeinfo/index.d.ts
rename to shared/models/nodeinfo/index.d.ts