-import { getServerAccount } from '../server/helpers'
-import { initDatabase } from '../server/initializers'
-import { AccountFollowModel } from '../server/models/account/account-follow'
+import { getServerActor } from '../server/helpers/utils'
+import { initDatabaseModels } from '../server/initializers'
+import { ActorFollowModel } from '../server/models/activitypub/actor-follow'