-import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage'
-import { UserRight } from '../../../../../shared/models/users/user-right.enum'
-// Do not use the barrel (dependency loop)
-import { hasUserRight, UserRole } from '../../../../../shared/models/users/user-role'
-import { User, UserConstructorHash } from '../../shared/users/user.model'
+import { User } from '@app/core/users/user.model'
+import { peertubeLocalStorage } from '@app/helpers/peertube-web-storage'
+import {
+ hasUserRight,
+ MyUser as ServerMyUserModel,
+ MyUserSpecialPlaylist,
+ NSFWPolicyType,
+ User as ServerUserModel,
+ UserRight,
+ UserRole
+} from '@shared/models'