diff --git a/detekt.yml b/detekt.yml
index 6059d595..cbdfa515 100644
--- a/detekt.yml
+++ b/detekt.yml
@@ -47,6 +47,9 @@ style:
   UseRequire:
     active: false
 
+  VarCouldBeVal:
+    ignoreLateinitVar: true
+
 complexity:
   CognitiveComplexMethod:
     active: true
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt
index c6187d2a..5f8af943 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt
@@ -1,8 +1,8 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
-import dev.usbharu.hideout.activitypub.domain.model.`object`.ObjectDeserializer
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer
 
 open class Accept : Object {
     @JsonDeserialize(using = ObjectDeserializer::class)
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt
index 8a11bd74..f81439c6 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt
@@ -1,8 +1,8 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
-import dev.usbharu.hideout.activitypub.domain.model.`object`.ObjectDeserializer
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer
 
 open class Create : Object {
     @JsonDeserialize(using = ObjectDeserializer::class)
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt
index 07fd34e9..d4f70180 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt
@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Document : Object {
 
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt
index 5f0c888f..cce3ee87 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt
@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Emoji : Object {
     var updated: String? = null
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt
index a4af7bbc..23648564 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt
@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Follow : Object {
     var `object`: String? = null
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt
index 09ddc19c..f177c8a0 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt
@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Image : Object {
     private var mediaType: String? = null
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt
index 5e182260..5cc33766 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt
@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Key : Object {
     var owner: String? = null
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt
index 6a6dc039..17e1037d 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt
@@ -1,8 +1,8 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
-import dev.usbharu.hideout.activitypub.domain.model.`object`.ObjectDeserializer
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer
 
 open class Like : Object {
     var `object`: String? = null
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt
index 46d395aa..ddca1d67 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt
@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Note : Object {
     var attributedTo: String? = null
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt
index afe87fb9..7ee0075e 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt
@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Person : Object {
     var preferredUsername: String? = null
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt
index 83841e8f..41cc0aa8 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt
@@ -1,8 +1,8 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
-import dev.usbharu.hideout.activitypub.domain.model.`object`.ObjectDeserializer
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer
 import java.time.Instant
 
 open class Undo : Object {
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/object/Object.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/Object.kt
similarity index 97%
rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/object/Object.kt
rename to src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/Object.kt
index cc37e451..703401ad 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/object/Object.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/Object.kt
@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.domain.model.`object`
+package dev.usbharu.hideout.activitypub.domain.model.objects
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.JsonSerializer
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/object/ObjectDeserializer.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectDeserializer.kt
similarity index 98%
rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/object/ObjectDeserializer.kt
rename to src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectDeserializer.kt
index accfc214..ad9969a2 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/object/ObjectDeserializer.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectDeserializer.kt
@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.domain.model.`object`
+package dev.usbharu.hideout.activitypub.domain.model.objects
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.DeserializationContext
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/object/ObjectValue.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectValue.kt
similarity index 92%
rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/object/ObjectValue.kt
rename to src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectValue.kt
index c4f8225b..1cd01d81 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/object/ObjectValue.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectValue.kt
@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.domain.model.`object`
+package dev.usbharu.hideout.activitypub.domain.model.objects
 
 open class ObjectValue : Object {
 
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/NoteQueryServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/NoteQueryServiceImpl.kt
index 460acf89..7b5d171a 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/NoteQueryServiceImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/NoteQueryServiceImpl.kt
@@ -3,7 +3,7 @@ package dev.usbharu.hideout.activitypub.infrastructure.exposedquery
 import dev.usbharu.hideout.activitypub.domain.model.Document
 import dev.usbharu.hideout.activitypub.domain.model.Note
 import dev.usbharu.hideout.activitypub.query.NoteQueryService
-import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteServiceImpl.Companion.public
+import dev.usbharu.hideout.activitypub.service.objects.note.APNoteServiceImpl.Companion.public
 import dev.usbharu.hideout.application.infrastructure.exposed.QueryMapper
 import dev.usbharu.hideout.core.domain.model.post.Post
 import dev.usbharu.hideout.core.domain.model.post.PostRepository
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPControllerImpl.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPControllerImpl.kt
index 2a83a418..0e52ca36 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPControllerImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPControllerImpl.kt
@@ -1,7 +1,7 @@
 package dev.usbharu.hideout.activitypub.interfaces.api.actor
 
 import dev.usbharu.hideout.activitypub.domain.model.Person
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.RestController
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/common/ActivityPubStringResponse.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/common/ActivityPubStringResponse.kt
index 60a18526..60b58404 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/common/ActivityPubStringResponse.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/common/ActivityPubStringResponse.kt
@@ -25,9 +25,7 @@ sealed class ActivityPubResponse(
         return result
     }
 
-    override fun toString(): String {
-        return "ActivityPubResponse(httpStatusCode=$httpStatusCode, contentType=$contentType)"
-    }
+    override fun toString(): String = "ActivityPubResponse(httpStatusCode=$httpStatusCode, contentType=$contentType)"
 }
 
 class ActivityPubStringResponse(
@@ -45,13 +43,9 @@ class ActivityPubStringResponse(
         return true
     }
 
-    override fun hashCode(): Int {
-        return message.hashCode()
-    }
+    override fun hashCode(): Int = message.hashCode()
 
-    override fun toString(): String {
-        return "ActivityPubStringResponse(message='$message') ${super.toString()}"
-    }
+    override fun toString(): String = "ActivityPubStringResponse(message='$message') ${super.toString()}"
 }
 
 class ActivityPubObjectResponse(
@@ -68,11 +62,7 @@ class ActivityPubObjectResponse(
         return true
     }
 
-    override fun hashCode(): Int {
-        return message.hashCode()
-    }
+    override fun hashCode(): Int = message.hashCode()
 
-    override fun toString(): String {
-        return "ActivityPubObjectResponse(message=$message) ${super.toString()}"
-    }
+    override fun toString(): String = "ActivityPubObjectResponse(message=$message) ${super.toString()}"
 }
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImpl.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImpl.kt
index 374f9b2c..d2c55e41 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImpl.kt
@@ -1,7 +1,7 @@
 package dev.usbharu.hideout.activitypub.interfaces.api.note
 
 import dev.usbharu.hideout.activitypub.domain.model.Note
-import dev.usbharu.hideout.activitypub.service.`object`.note.NoteApApiService
+import dev.usbharu.hideout.activitypub.service.objects.note.NoteApApiService
 import dev.usbharu.hideout.core.infrastructure.springframework.httpsignature.HttpSignatureUser
 import org.springframework.http.ResponseEntity
 import org.springframework.security.core.annotation.CurrentSecurityContext
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/APCreateService.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/APCreateService.kt
index ec073d95..e0d179ea 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/APCreateService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/APCreateService.kt
@@ -5,7 +5,7 @@ import dev.usbharu.hideout.activitypub.domain.model.Create
 import dev.usbharu.hideout.activitypub.domain.model.Note
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubResponse
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse
-import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteService
+import dev.usbharu.hideout.activitypub.service.objects.note.APNoteService
 import dev.usbharu.hideout.application.external.Transaction
 import io.ktor.http.*
 import org.slf4j.LoggerFactory
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobServiceImpl.kt
index b3da9d3c..02a466ab 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobServiceImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobServiceImpl.kt
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.module.kotlin.readValue
 import dev.usbharu.hideout.activitypub.domain.model.Accept
 import dev.usbharu.hideout.activitypub.domain.model.Follow
 import dev.usbharu.hideout.activitypub.service.common.APRequestService
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.application.external.Transaction
 import dev.usbharu.hideout.core.external.job.ReceiveFollowJob
 import dev.usbharu.hideout.core.query.UserQueryService
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeService.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeService.kt
index 739f4f83..c37af164 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeService.kt
@@ -5,8 +5,8 @@ import dev.usbharu.hideout.activitypub.domain.exception.IllegalActivityPubObject
 import dev.usbharu.hideout.activitypub.domain.model.Like
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubResponse
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse
-import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteService
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.note.APNoteService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.application.external.Transaction
 import dev.usbharu.hideout.core.query.PostQueryService
 import dev.usbharu.hideout.core.service.reaction.ReactionService
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APUndoService.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APUndoService.kt
index 84a6d60c..372ff33c 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APUndoService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APUndoService.kt
@@ -4,7 +4,7 @@ import dev.usbharu.hideout.activitypub.domain.model.Follow
 import dev.usbharu.hideout.activitypub.domain.model.Undo
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubResponse
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.application.external.Transaction
 import dev.usbharu.hideout.core.query.UserQueryService
 import dev.usbharu.hideout.core.service.user.UserService
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestService.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestService.kt
index 8ac971a7..da3954f7 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestService.kt
@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 import dev.usbharu.hideout.core.domain.model.user.User
 
 interface APRequestService {
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImpl.kt
index 395f6906..6e8edef9 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImpl.kt
@@ -1,7 +1,7 @@
 package dev.usbharu.hideout.activitypub.service.common
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 import dev.usbharu.hideout.core.domain.model.user.User
 import dev.usbharu.hideout.util.Base64Util
 import dev.usbharu.hideout.util.HttpUtil.Activity
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveService.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveService.kt
index c5ac196c..203d3159 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveService.kt
@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 import dev.usbharu.hideout.core.domain.model.user.User
 
 interface APResourceResolveService {
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt
index cc3c08ac..49906265 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt
@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 import dev.usbharu.hideout.core.domain.model.user.User
 import dev.usbharu.hideout.core.domain.model.user.UserRepository
 import org.springframework.stereotype.Service
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ApJobServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ApJobServiceImpl.kt
index b57679f2..7057ccc5 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ApJobServiceImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ApJobServiceImpl.kt
@@ -2,7 +2,7 @@ package dev.usbharu.hideout.activitypub.service.common
 
 import dev.usbharu.hideout.activitypub.service.activity.follow.APReceiveFollowJobService
 import dev.usbharu.hideout.activitypub.service.activity.like.ApReactionJobService
-import dev.usbharu.hideout.activitypub.service.`object`.note.ApNoteJobService
+import dev.usbharu.hideout.activitypub.service.objects.note.ApNoteJobService
 import dev.usbharu.hideout.core.external.job.*
 import kjob.core.dsl.JobContextWithProps
 import kjob.core.job.JobProps
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/CacheManager.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/CacheManager.kt
index 1723f138..83ae4f9d 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/CacheManager.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/CacheManager.kt
@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 interface CacheManager {
 
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/InMemoryCacheManager.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/InMemoryCacheManager.kt
index 70ac6147..3c8320db 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/InMemoryCacheManager.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/InMemoryCacheManager.kt
@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 import dev.usbharu.hideout.util.LruCache
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.sync.Mutex
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/note/APNoteService.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteService.kt
similarity index 98%
rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/note/APNoteService.kt
rename to src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteService.kt
index 29d7c2be..beaf1fd3 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/note/APNoteService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteService.kt
@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.service.`object`.note
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import dev.usbharu.hideout.activitypub.domain.exception.FailedToGetActivityPubResourceException
@@ -6,7 +6,7 @@ import dev.usbharu.hideout.activitypub.domain.exception.IllegalActivityPubObject
 import dev.usbharu.hideout.activitypub.domain.model.Note
 import dev.usbharu.hideout.activitypub.service.common.APResourceResolveService
 import dev.usbharu.hideout.activitypub.service.common.resolve
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
 import dev.usbharu.hideout.core.domain.model.post.Post
 import dev.usbharu.hideout.core.domain.model.post.PostRepository
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/note/ApNoteJobService.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobService.kt
similarity index 75%
rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/note/ApNoteJobService.kt
rename to src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobService.kt
index 875791a2..ad7ea01e 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/note/ApNoteJobService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobService.kt
@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.service.`object`.note
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import dev.usbharu.hideout.core.external.job.DeliverPostJob
 import kjob.core.job.JobProps
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/note/ApNoteJobServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobServiceImpl.kt
similarity index 97%
rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/note/ApNoteJobServiceImpl.kt
rename to src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobServiceImpl.kt
index 94a1cfae..83daa89d 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/note/ApNoteJobServiceImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobServiceImpl.kt
@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.service.`object`.note
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/note/NoteApApiService.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiService.kt
similarity index 70%
rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/note/NoteApApiService.kt
rename to src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiService.kt
index 9402363d..2ddd86ca 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/note/NoteApApiService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiService.kt
@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.service.`object`.note
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import dev.usbharu.hideout.activitypub.domain.model.Note
 
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/note/NoteApApiServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiServiceImpl.kt
similarity index 95%
rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/note/NoteApApiServiceImpl.kt
rename to src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiServiceImpl.kt
index d3646e04..84485ba3 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/note/NoteApApiServiceImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiServiceImpl.kt
@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.service.`object`.note
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import dev.usbharu.hideout.activitypub.domain.model.Note
 import dev.usbharu.hideout.activitypub.query.NoteQueryService
diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/user/APUserService.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/user/APUserService.kt
similarity index 98%
rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/user/APUserService.kt
rename to src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/user/APUserService.kt
index 4c476dda..8aee16a4 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/object/user/APUserService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/user/APUserService.kt
@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.service.`object`.user
+package dev.usbharu.hideout.activitypub.service.objects.user
 
 import dev.usbharu.hideout.activitypub.domain.exception.IllegalActivityPubObjectException
 import dev.usbharu.hideout.activitypub.domain.model.Image
diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt
index 46884853..ee507aed 100644
--- a/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt
@@ -25,7 +25,8 @@ class MediaServiceImpl(
 ) : MediaService {
     override suspend fun uploadLocalMedia(mediaRequest: MediaRequest): EntityMedia {
         logger.info(
-            "Media upload. filename:${mediaRequest.file.name} size:${mediaRequest.file.size} contentType:${mediaRequest.file.contentType}"
+            "Media upload. filename:${mediaRequest.file.name} size:${mediaRequest.file.size} " +
+                    "contentType:${mediaRequest.file.contentType}"
         )
 
         if (mediaRequest.file.size == 0L) {
diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/APCreateServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/APCreateServiceImplTest.kt
index 4ec47449..87e66044 100644
--- a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/APCreateServiceImplTest.kt
+++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/APCreateServiceImplTest.kt
@@ -5,7 +5,7 @@ import dev.usbharu.hideout.activitypub.domain.model.Create
 import dev.usbharu.hideout.activitypub.domain.model.Like
 import dev.usbharu.hideout.activitypub.domain.model.Note
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse
-import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteService
+import dev.usbharu.hideout.activitypub.service.objects.note.APNoteService
 import io.ktor.http.*
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowServiceImplTest.kt
index c01f2570..a416d82a 100644
--- a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowServiceImplTest.kt
+++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowServiceImplTest.kt
@@ -7,7 +7,7 @@ import dev.usbharu.hideout.activitypub.domain.model.Follow
 import dev.usbharu.hideout.activitypub.domain.model.Image
 import dev.usbharu.hideout.activitypub.domain.model.Key
 import dev.usbharu.hideout.activitypub.domain.model.Person
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.application.config.ApplicationConfig
 import dev.usbharu.hideout.application.config.CharacterLimit
 import dev.usbharu.hideout.core.domain.model.post.Post
diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeServiceImplTest.kt
index 2f4ce89a..3b37fffc 100644
--- a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeServiceImplTest.kt
+++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeServiceImplTest.kt
@@ -5,8 +5,8 @@ import dev.usbharu.hideout.activitypub.domain.model.Like
 import dev.usbharu.hideout.activitypub.domain.model.Note
 import dev.usbharu.hideout.activitypub.domain.model.Person
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse
-import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteService
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.note.APNoteService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.core.query.PostQueryService
 import dev.usbharu.hideout.core.service.reaction.ReactionService
 import io.ktor.http.*
diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImplTest.kt
index 4d02925a..46b50898 100644
--- a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImplTest.kt
+++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImplTest.kt
@@ -9,7 +9,7 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.junit.jupiter.MockitoExtension
 import org.mockito.kotlin.*
 import utils.UserBuilder
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object as APObject
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object as APObject
 
 @ExtendWith(MockitoExtension::class)
 
diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/object/note/APNoteServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteServiceImplTest.kt
similarity index 98%
rename from src/test/kotlin/dev/usbharu/hideout/activitypub/service/object/note/APNoteServiceImplTest.kt
rename to src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteServiceImplTest.kt
index 775fd9b3..e596fd02 100644
--- a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/object/note/APNoteServiceImplTest.kt
+++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteServiceImplTest.kt
@@ -1,6 +1,6 @@
 @file:OptIn(ExperimentalCoroutinesApi::class) @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 
-package dev.usbharu.hideout.activitypub.service.`object`.note
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import dev.usbharu.hideout.activitypub.domain.exception.FailedToGetActivityPubResourceException
 import dev.usbharu.hideout.activitypub.domain.model.Image
@@ -8,8 +8,8 @@ import dev.usbharu.hideout.activitypub.domain.model.Key
 import dev.usbharu.hideout.activitypub.domain.model.Note
 import dev.usbharu.hideout.activitypub.domain.model.Person
 import dev.usbharu.hideout.activitypub.service.common.APResourceResolveService
-import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteServiceImpl.Companion.public
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.note.APNoteServiceImpl.Companion.public
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.application.config.ApplicationConfig
 import dev.usbharu.hideout.application.config.CharacterLimit
 import dev.usbharu.hideout.application.service.id.TwitterSnowflakeIdGenerateService
diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/object/note/ApNoteJobServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobServiceImplTest.kt
similarity index 97%
rename from src/test/kotlin/dev/usbharu/hideout/activitypub/service/object/note/ApNoteJobServiceImplTest.kt
rename to src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobServiceImplTest.kt
index 202db338..62eb6507 100644
--- a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/object/note/ApNoteJobServiceImplTest.kt
+++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobServiceImplTest.kt
@@ -1,6 +1,6 @@
 @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 
-package dev.usbharu.hideout.activitypub.service.`object`.note
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import dev.usbharu.hideout.activitypub.domain.model.Create
 import dev.usbharu.hideout.activitypub.domain.model.Note