-import { ActorModel } from '../models/activitypub/actor'
-import * as Bluebird from 'bluebird'
-import { MActorFull, MActorAccountChannelId } from '../typings/models'
+
+import { ActorModel } from '../models/actor/actor'
+import { MActorAccountChannelId, MActorFull } from '../types/models'