diff --git a/src/main/kotlin/config/BremerConfig.kt b/src/main/kotlin/config/BremerConfig.kt
index 5aab926..c420f26 100644
--- a/src/main/kotlin/config/BremerConfig.kt
+++ b/src/main/kotlin/config/BremerConfig.kt
@@ -4,7 +4,7 @@
 
 package net.piedpiper.bremer.config
 
-import net.piedpiper.bremer.service.app.LoginAppService
+import net.piedpiper.bremer.service.LoginService
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
 import org.springframework.beans.factory.annotation.Qualifier
@@ -30,8 +30,8 @@
 @Configuration
 @EnableWebSecurity
 class WebSecurityConfig(
-    @Qualifier("bremer.service.LoginAppService")
-    private val loginAppService: LoginAppService
+    @Qualifier("bremer.service.LoginService")
+    private val loginService: LoginService
 ) {
     @Bean
     fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {
@@ -57,7 +57,7 @@
                 .logoutSuccessUrl("/bremer/login.html?logout")
         }
             .csrf { it.disable() }
-            .userDetailsService(loginAppService)
+            .userDetailsService(loginService)
         return http.build()
     }
 }
diff --git a/src/main/kotlin/controller/api/AudioApiController.kt b/src/main/kotlin/controller/api/AudioApiController.kt
index c3ada9e..fa3b81e 100644
--- a/src/main/kotlin/controller/api/AudioApiController.kt
+++ b/src/main/kotlin/controller/api/AudioApiController.kt
@@ -5,7 +5,7 @@
 package net.piedpiper.bremer.controller.api
 
 import net.piedpiper.bremer.model.api.AudioListResponse
-import net.piedpiper.bremer.service.app.AudioAppService
+import net.piedpiper.bremer.service.AudioService
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.GetMapping
@@ -13,21 +13,22 @@
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 
-@RestController
+@RestController("bremer.controller.AudioApiController")
 @RequestMapping("bremer/api/audio")
 class AudioApiController(
-    @Qualifier("bremer.service.AudioAppService")
-    private val audioAppService: AudioAppService
+    @Qualifier("bremer.service.AudioService")
+    private val audioService: AudioService
 ) {
     @GetMapping
     fun getAudioList(
         @RequestParam("audio", required = false) audioName: String?,
         @RequestParam("artist", required = false) artistName: String?,
-        @RequestParam("album", required = false) albumName: String?
+        @RequestParam("album", required = false) albumName: String?,
+        @RequestParam("tag", required = false) tagName: String?
     ): ResponseEntity<AudioListResponse> =
-        ResponseEntity.ok(audioAppService.getByKeywords(audioName, artistName, albumName))
+        ResponseEntity.ok(audioService.getByKeywords(audioName, artistName, albumName, tagName))
 
     @GetMapping("history")
     fun getLeastRecentlyPlayedList(): ResponseEntity<AudioListResponse> =
-        ResponseEntity.ok(audioAppService.getLeastRecentlyAccessedAudio())
+        ResponseEntity.ok(audioService.getLeastRecentlyAccessedAudio())
 }
\ No newline at end of file
diff --git a/src/main/kotlin/controller/api/PlaylistApiController.kt b/src/main/kotlin/controller/api/PlaylistApiController.kt
index 5e4b8ad..e100bad 100644
--- a/src/main/kotlin/controller/api/PlaylistApiController.kt
+++ b/src/main/kotlin/controller/api/PlaylistApiController.kt
@@ -5,11 +5,10 @@
 package net.piedpiper.bremer.controller.api
 
 import jakarta.validation.Valid
-import net.piedpiper.bremer.entity.AudioEntity
-import net.piedpiper.bremer.model.PlaylistAudioResponse
-import net.piedpiper.bremer.model.PlaylistListResponse
-import net.piedpiper.bremer.model.PlaylistRequest
-import net.piedpiper.bremer.service.app.PlaylistAppService
+import net.piedpiper.bremer.model.api.PlaylistAudioResponse
+import net.piedpiper.bremer.model.api.PlaylistListResponse
+import net.piedpiper.bremer.model.api.PlaylistRequest
+import net.piedpiper.bremer.service.PlaylistService
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.GetMapping
@@ -18,34 +17,32 @@
 import org.springframework.web.bind.annotation.PutMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
-import java.util.UUID
 
-@RestController
+@RestController("bremer.controller.PlaylistApiController")
 @RequestMapping("bremer/api/playlist")
 class PlaylistApiController(
-    @Qualifier("bremer.service.PlaylistAppService")
-    private val playlistAppService: PlaylistAppService,
+    @Qualifier("bremer.service.PlaylistService")
+    private val playlistService: PlaylistService,
 ) {
     @GetMapping
     fun getAll(): ResponseEntity<PlaylistListResponse> =
-        ResponseEntity.ok(playlistAppService.getAllPlaylists())
+        ResponseEntity.ok(playlistService.getAllPlaylists())
 
     @GetMapping("{slug}")
     fun get(@PathVariable("slug") slug: String): ResponseEntity<PlaylistAudioResponse> =
-        ResponseEntity.ok(playlistAppService.getPlaylist(slug))
+        ResponseEntity.ok(playlistService.getPlaylist(slug))
 
     @PostMapping
     fun create(
         @Valid @RequestBody request: PlaylistRequest
     ): ResponseEntity<PlaylistAudioResponse> =
-        ResponseEntity.ok(playlistAppService.createPlaylist(request))
+        ResponseEntity.ok(playlistService.createPlaylist(request))
 
     @PutMapping("{slug}")
     fun update(
         @PathVariable("slug") slug: String,
         @Valid @RequestBody request: PlaylistRequest
     ): ResponseEntity<PlaylistAudioResponse> =
-        ResponseEntity.ok(playlistAppService.updatePlaylist(slug, request))
+        ResponseEntity.ok(playlistService.updatePlaylist(slug, request))
 }
diff --git a/src/main/kotlin/controller/view/AudioViewController.kt b/src/main/kotlin/controller/view/AudioViewController.kt
index 13a9a62..c1768de 100644
--- a/src/main/kotlin/controller/view/AudioViewController.kt
+++ b/src/main/kotlin/controller/view/AudioViewController.kt
@@ -5,7 +5,7 @@
 package net.piedpiper.bremer.controller.view
 
 import jakarta.servlet.http.HttpServletResponse
-import net.piedpiper.bremer.service.app.AudioAppService
+import net.piedpiper.bremer.service.AudioService
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.http.MediaType
 import org.springframework.stereotype.Controller
@@ -17,8 +17,8 @@
 @Controller("bremer.controller.AudioController")
 @RequestMapping("bremer/audio")
 class AudioViewController(
-    @Qualifier("bremer.service.AudioAppService")
-    private val audioAppService: AudioAppService
+    @Qualifier("bremer.service.AudioService")
+    private val audioService: AudioService
 ) {
 
     @GetMapping("{slug}")
@@ -26,7 +26,7 @@
         @PathVariable("slug") slug: String,
         response: HttpServletResponse
     ) {
-        val file = audioAppService.getAudioFile(slug)
+        val file = audioService.getAudioFile(slug)
         response.outputStream.use {
             response.setContentLengthLong(file.length())
             response.contentType = MediaType.APPLICATION_OCTET_STREAM_VALUE
diff --git a/src/main/kotlin/dao/AudioDao.kt b/src/main/kotlin/dao/AudioDao.kt
index a306032..cebd621 100644
--- a/src/main/kotlin/dao/AudioDao.kt
+++ b/src/main/kotlin/dao/AudioDao.kt
@@ -4,10 +4,7 @@
 
 package net.piedpiper.bremer.dao
 
-import net.piedpiper.bremer.entity.AlbumEntity
-import net.piedpiper.bremer.entity.ArtistEntity
-import net.piedpiper.bremer.entity.AudioEntity
-import net.piedpiper.bremer.entity.AudioNameEntity
+import net.piedpiper.bremer.entity.*
 import net.piedpiper.bremer.utils.SelectSQLBuilder
 import net.piedpiper.bremer.utils.WHERE_IN
 import org.apache.ibatis.annotations.*
@@ -30,6 +27,10 @@
     fun findAllByAlbumIdIn(@Param("albumIds") albumIds: List<Long>): List<AudioEntity>
 
     @ResultMap("net.piedpiper.bremer.AudioEntity")
+    @SelectProvider(type = Sql::class, method = "findAllByTagIdIn")
+    fun findAllByTagIdIn(@Param("tagIds") tagIds: List<Long>): List<AudioEntity>
+
+    @ResultMap("net.piedpiper.bremer.AudioEntity")
     @SelectProvider(type = Sql::class, method = "findAllByIdIn")
     fun findAllByIdIn(@Param("ids") ids: List<Long>): List<AudioEntity>
 
@@ -72,6 +73,7 @@
                     .leftOuterJoin(AudioNameEntity::class, "audio.id = audio_name.audio_id")
                     .toSql()
                     .WHERE_IN("audio.album_id", "albumIds", albumIds.size)
+                    .ORDER_BY("audio.album_id, audio.sequence")
                     .toString()
 
             @JvmStatic
@@ -82,6 +84,7 @@
                     .leftOuterJoin(AudioNameEntity::class, "audio.id = audio_name.audio_id")
                     .toSql()
                     .WHERE_IN("audio.id", "ids", ids.size)
+                    .ORDER_BY("audio.album_id, audio.sequence")
                     .toString()
 
             @JvmStatic
@@ -92,6 +95,19 @@
                     .leftOuterJoin(AudioNameEntity::class, "audio.id = audio_name.audio_id")
                     .toSql()
                     .WHERE_IN("audio.slug", "slugs", slugs.size)
+                    .ORDER_BY("audio.album_id, audio.sequence")
+                    .toString()
+
+            @JvmStatic
+            fun findAllByTagIdIn(@Param("tagIds") tagIds: List<Long>): String =
+                SelectSQLBuilder(AudioEntity::class)
+                    .leftOuterJoin(AlbumEntity::class, "audio.album_id = album.id")
+                    .leftOuterJoin(ArtistEntity::class, "album.artist_id = artist.id", AlbumEntity::class)
+                    .leftOuterJoin(AudioNameEntity::class, "audio.id = audio_name.audio_id")
+                    .leftOuterJoin(AudioTagEntity::class, "audio.id = audio_tag.audio_id")
+                    .toSql()
+                    .WHERE_IN("audio_tag.tag_id", "tagIds", tagIds.size)
+                    .ORDER_BY("audio.album_id, audio.sequence")
                     .toString()
 
             @JvmStatic
diff --git a/src/main/kotlin/dao/PlaylistDao.kt b/src/main/kotlin/dao/PlaylistDao.kt
index 5c024d1..3511149 100644
--- a/src/main/kotlin/dao/PlaylistDao.kt
+++ b/src/main/kotlin/dao/PlaylistDao.kt
@@ -24,13 +24,16 @@
     fun findOneBySlug(@Param("slug") slug: String): PlaylistEntity?
 
     @ResultMap("net.piedpiper.bremer.PlaylistEntity")
-    @Select("SELECT * FROM playlist")
-    fun findAll(): List<PlaylistEntity>
+    @Select("SELECT * FROM playlist ORDER BY sequence ASC")
+    fun findAllOrderBySequence(): List<PlaylistEntity>
 
     @InsertProvider(type = Sql::class, method = "insertOne")
     @Options(useGeneratedKeys = true, keyProperty = "id")
     fun insertOne(@Param("entity") entity: PlaylistEntity): Boolean
 
+    @Delete("DELETE FROM playlist WHERE slug = #{slug}")
+    fun deleteBySlug(@Param("slug") slug: String): Boolean
+
     @UpdateProvider(type = Sql::class, method = "updateOne")
     fun updateOne(@Param("entity") entity: PlaylistEntity)
 
diff --git a/src/main/kotlin/dao/TagDao.kt b/src/main/kotlin/dao/TagDao.kt
new file mode 100644
index 0000000..5ef8151
--- /dev/null
+++ b/src/main/kotlin/dao/TagDao.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2023. yo-saito. All Rights Reserved.
+ */
+
+package net.piedpiper.bremer.dao
+
+import net.piedpiper.bremer.entity.TagEntity
+import org.apache.ibatis.annotations.Mapper
+import org.apache.ibatis.annotations.Param
+import org.apache.ibatis.annotations.ResultMap
+import org.apache.ibatis.annotations.Select
+import org.springframework.stereotype.Repository
+
+@Repository("bremer.dao.TagDao")
+@Mapper
+interface TagDao {
+
+    @ResultMap("net.piedpiper.bremer.TagEntity")
+    @Select("SELECT * FROM tag")
+    fun findAll(): List<TagEntity>
+
+    @ResultMap("net.piedpiper.bremer.TagEntity")
+    @Select("SELECT * FROM tag WHERE name LIKE CONCAT('%', #{nameLike}, '%') LIMIT #{limit}")
+    fun findAllByNameLikeLimit(
+        @Param("nameLike") nameLike: String,
+        @Param("limit") limit: Int
+    ): List<TagEntity>
+}
\ No newline at end of file
diff --git a/src/main/kotlin/entity/Audio.kt b/src/main/kotlin/entity/Audio.kt
deleted file mode 100644
index f8f9f72..0000000
--- a/src/main/kotlin/entity/Audio.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2023. yo-saito. All Rights Reserved.
- */
-
-package net.piedpiper.bremer.entity
-
-import net.piedpiper.bremer.utils.sql.Column
-import net.piedpiper.bremer.utils.sql.Table
-import java.time.LocalDateTime
-
-@Table("audio")
-data class AudioEntity(
-    @property:Column("id", insertable = false, updatable = false)
-    var id: Long = 0L,
-    @property:Column("slug")
-    var slug: String = "",
-    @property:Column("name")
-    var name: String = "",
-    @property:Column("album_id")
-    var albumId: Long = 0L,
-    @property:Column("sequence")
-    var sequence: Int = 0,
-    @property:Column("path")
-    var path: String = "",
-    // join
-    var album: AlbumEntity? = null,
-    var aliasNames: List<AudioNameEntity>? = null
-)
-
-@Table("audio_name")
-data class AudioNameEntity(
-    @property:Column("id", insertable = false, updatable = false)
-    var id: Long = 0L,
-    @property:Column("audio_id")
-    var audioId: Long = 0L,
-    @property:Column("name")
-    var name: String = ""
-)
-
-@Table("album")
-data class AlbumEntity(
-    @property:Column("id", insertable = false, updatable = false)
-    var id: Long = 0L,
-    @property:Column("artist_id")
-    var artistId: Long = 0L,
-    @property:Column("name")
-    var name: String = "",
-    // join
-    var artist: ArtistEntity? = null
-)
-
-@Table("artist")
-data class ArtistEntity(
-    @property:Column("id", insertable = false, updatable = false)
-    var id: Long = 0L,
-    @property:Column("name")
-    var name: String = "",
-)
-
-@Table("audio_play_history")
-data class AudioPlayHistoryEntity(
-    @property:Column("id", insertable = false, updatable = false)
-    var id: Long = 0L,
-    @property:Column("audio_id")
-    var audioId: Long = 0L,
-    @property:Column("last_played_at")
-    var lastPlayedAt: LocalDateTime = LocalDateTime.MIN
-)
diff --git a/src/main/kotlin/entity/Entity.kt b/src/main/kotlin/entity/Entity.kt
new file mode 100644
index 0000000..d456668
--- /dev/null
+++ b/src/main/kotlin/entity/Entity.kt
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2023. yo-saito. All Rights Reserved.
+ */
+
+package net.piedpiper.bremer.entity
+
+import net.piedpiper.bremer.utils.sql.Column
+import net.piedpiper.bremer.utils.sql.Table
+import java.time.LocalDateTime
+
+@Table("audio")
+data class AudioEntity(
+    @property:Column("id", insertable = false, updatable = false)
+    var id: Long = 0L,
+    @property:Column("slug")
+    var slug: String = "",
+    @property:Column("name")
+    var name: String = "",
+    @property:Column("album_id")
+    var albumId: Long = 0L,
+    @property:Column("sequence")
+    var sequence: Int = 0,
+    @property:Column("path")
+    var path: String = "",
+    // join
+    var album: AlbumEntity? = null,
+    var aliasNames: List<AudioNameEntity>? = null
+)
+
+@Table("audio_name")
+data class AudioNameEntity(
+    @property:Column("id", insertable = false, updatable = false)
+    var id: Long = 0L,
+    @property:Column("audio_id")
+    var audioId: Long = 0L,
+    @property:Column("name")
+    var name: String = ""
+)
+
+@Table("album")
+data class AlbumEntity(
+    @property:Column("id", insertable = false, updatable = false)
+    var id: Long = 0L,
+    @property:Column("artist_id")
+    var artistId: Long = 0L,
+    @property:Column("name")
+    var name: String = "",
+    // join
+    var artist: ArtistEntity? = null
+)
+
+@Table("artist")
+data class ArtistEntity(
+    @property:Column("id", insertable = false, updatable = false)
+    var id: Long = 0L,
+    @property:Column("name")
+    var name: String = "",
+)
+
+@Table("audio_tag")
+data class AudioTagEntity(
+    @property:Column("id", insertable = false, updatable = false)
+    var id: Long = 0L,
+    @property:Column("audio_id")
+    var audioId: Long = 0L,
+    @property:Column("tag_id")
+    var tagId: Long = 0L
+)
+
+@Table("user")
+data class UserEntity(
+    @property:Column("id", insertable = false, updatable = false)
+    var id: Long = 0L,
+    @property:Column("account_id")
+    var accountId: String = "",
+    @property:Column("secret")
+    var secret: String = "",
+)
+
+@Table("audio_play_history")
+data class AudioPlayHistoryEntity(
+    @property:Column("id", insertable = false, updatable = false)
+    var id: Long = 0L,
+    @property:Column("audio_id")
+    var audioId: Long = 0L,
+    @property:Column("last_played_at")
+    var lastPlayedAt: LocalDateTime = LocalDateTime.MIN
+)
+
+@Table("playlist")
+data class PlaylistEntity(
+    @property:Column("id", insertable = false, updatable = false)
+    var id: Long = 0L,
+    @property:Column("slug")
+    var slug: String = "",
+    @property:Column("name")
+    var name: String = "",
+    @property:Column("sequence")
+    var sequence: Int = 0,
+    // join
+    var playlistAudio: List<PlaylistAudioEntity> = mutableListOf()
+)
+
+@Table("playlist_audio")
+data class PlaylistAudioEntity(
+    @property:Column("id", insertable = false, updatable = false)
+    var id: Long = 0L,
+    @property:Column("playlist_id")
+    var playlistId: Long = 0L,
+    @property:Column("sequence")
+    var sequence: Int = 0,
+    @property:Column("audio_id")
+    var audioId: Long = 0L
+)
+
+@Table("tag")
+data class TagEntity(
+    @property:Column("id", insertable = false, updatable = false)
+    var id: Long = 0L,
+    @property:Column("name")
+    var name: String = "",
+)
diff --git a/src/main/kotlin/entity/Playlist.kt b/src/main/kotlin/entity/Playlist.kt
deleted file mode 100644
index e9680a2..0000000
--- a/src/main/kotlin/entity/Playlist.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2023. yo-saito. All Rights Reserved.
- */
-
-package net.piedpiper.bremer.entity
-
-import net.piedpiper.bremer.utils.sql.Column
-import net.piedpiper.bremer.utils.sql.Table
-
-
-@Table("playlist")
-data class PlaylistEntity(
-    @property:Column("id", insertable = false, updatable = false)
-    var id: Long = 0L,
-    @property:Column("slug")
-    var slug: String = "",
-    @property:Column("name")
-    var name: String = "",
-    // join
-    var playlistAudio: List<PlaylistAudioEntity> = mutableListOf()
-)
-
-@Table("playlist_audio")
-data class PlaylistAudioEntity(
-    @property:Column("id", insertable = false, updatable = false)
-    var id: Long = 0L,
-    @property:Column("playlist_id")
-    var playlistId: Long = 0L,
-    @property:Column("sequence")
-    var sequence: Int = 0,
-    @property:Column("audio_id")
-    var audioId: Long = 0L
-)
diff --git a/src/main/kotlin/entity/User.kt b/src/main/kotlin/entity/User.kt
deleted file mode 100644
index 90f2d5c..0000000
--- a/src/main/kotlin/entity/User.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2023. yo-saito. All Rights Reserved.
- */
-
-package net.piedpiper.bremer.entity
-
-import net.piedpiper.bremer.utils.sql.Column
-import net.piedpiper.bremer.utils.sql.Table
-
-@Table("user")
-data class UserEntity(
-    @property:Column("id", insertable = false, updatable = false)
-    var id: Long = 0L,
-    @property:Column("account_id")
-    var accountId: String = "",
-    @property:Column("secret")
-    var secret: String = "",
-)
\ No newline at end of file
diff --git a/src/main/kotlin/model/api/Api.kt b/src/main/kotlin/model/api/Api.kt
new file mode 100644
index 0000000..d054266
--- /dev/null
+++ b/src/main/kotlin/model/api/Api.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2023. yo-saito. All Rights Reserved.
+ */
+
+package net.piedpiper.bremer.model.api
+
+import com.fasterxml.jackson.annotation.JsonInclude
+import com.fasterxml.jackson.annotation.JsonProperty
+import jakarta.validation.constraints.NotBlank
+import net.piedpiper.bremer.entity.AudioEntity
+import net.piedpiper.bremer.entity.PlaylistEntity
+
+data class AudioListResponse(
+    private val entities: List<AudioEntity>
+) {
+    val audio: List<Audio> =
+        entities.map { Audio(it) }
+
+    data class Audio(
+        private val entity: AudioEntity
+    ) {
+        val name: String = entity.name
+        val slug: String = entity.slug
+        val artist: String? = entity?.album?.artist?.name
+        val album: String? = entity?.album?.name
+        var sequence: Int? = if (entity?.sequence == 0) { entity?.sequence } else { null }
+        var aliasNames: List<String>? = entity?.aliasNames?.map { it.name }
+    }
+}
+
+data class PlaylistListRequest(
+    @field:JsonProperty("playlist_slugs")
+    val playlistSlugs: List<String>
+)
+
+data class PlaylistListResponse(
+    private val entities: List<PlaylistEntity>
+) {
+    val playlist: List<Playlist> = entities.map { Playlist(it.name, it.sequence, it.slug) }
+
+    data class Playlist(
+        val name: String,
+        var sequence: Int,
+        val slug: String
+    )
+}
+
+data class PlaylistRequest(
+    @field:NotBlank
+    val name: String = "",
+
+    @field:JsonProperty("audio_slugs")
+    val audioSlugs: List<String> = mutableListOf()
+)
+
+class PlaylistAudioResponse(
+    private val playlistEntity: PlaylistEntity,
+    private val audioEntityList: List<AudioEntity>
+) {
+    val name: String = playlistEntity.name
+    val slug: String = playlistEntity.slug
+
+    @field:JsonProperty("audio_list")
+    val audioList: List<Audio> = audioEntityList.map { Audio(it) }
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    class Audio(private val entity: AudioEntity) {
+        val name: String = entity.name
+        val aliasName : List<String> = entity.aliasNames?.map { it.name } ?: emptyList()
+        val slug: String = entity.slug
+        val artist: String? = entity.album?.artist?.name
+        val album: String? = entity.album?.name
+    }
+}
diff --git a/src/main/kotlin/model/api/Audio.kt b/src/main/kotlin/model/api/Audio.kt
deleted file mode 100644
index 61171c8..0000000
--- a/src/main/kotlin/model/api/Audio.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2023. yo-saito. All Rights Reserved.
- */
-
-package net.piedpiper.bremer.model.api
-
-import net.piedpiper.bremer.entity.AudioEntity
-
-data class AudioListResponse(
-    private val entities: List<AudioEntity>
-) {
-    val audio: List<Audio> =
-        entities.map { Audio(it) }
-
-    data class Audio(
-        private val entity: AudioEntity
-    ) {
-        val name: String = entity.name
-        val slug: String = entity.slug
-        val artist: String? = entity?.album?.artist?.name
-        val album: String? = entity?.album?.name
-        var sequence: Int? = if (entity?.sequence == 0) { entity?.sequence } else { null }
-        var aliasNames: List<String>? = entity?.aliasNames?.map { it.name }
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/model/api/Playlist.kt b/src/main/kotlin/model/api/Playlist.kt
deleted file mode 100644
index 1e3b06a..0000000
--- a/src/main/kotlin/model/api/Playlist.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2023. yo-saito. All Rights Reserved.
- */
-
-package net.piedpiper.bremer.model
-
-import com.fasterxml.jackson.annotation.JsonInclude
-import com.fasterxml.jackson.annotation.JsonProperty
-import jakarta.validation.constraints.NotBlank
-import net.piedpiper.bremer.entity.AudioEntity
-import net.piedpiper.bremer.entity.PlaylistEntity
-
-
-data class PlaylistListResponse(
-    private val entities: List<PlaylistEntity>
-) {
-    val playlist: List<Playlist> = entities.map { Playlist(it.name, it.slug) }
-
-    data class Playlist(
-        val name: String,
-        val slug: String
-    )
-}
-
-data class PlaylistRequest(
-    @field:NotBlank
-    val name: String = "",
-
-    @field:JsonProperty("audio_slugs")
-    val audioSlugs: List<String> = mutableListOf()
-)
-
-class PlaylistAudioResponse(
-    private val playlistEntity: PlaylistEntity,
-    private val audioEntityList: List<AudioEntity>
-) {
-    val name: String = playlistEntity.name
-    val slug: String = playlistEntity.slug
-
-    @field:JsonProperty("audio_list")
-    val audioList: List<Audio> = audioEntityList.map { Audio(it) }
-
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    class Audio(private val entity: AudioEntity) {
-        val name: String = entity.name
-        val slug: String = entity.slug
-        val artist: String? = entity.album?.artist?.name
-        val album: String? = entity.album?.name
-    }
-}
diff --git a/src/main/kotlin/repository/AudioRepository.kt b/src/main/kotlin/repository/AudioRepository.kt
index 8e0ca5f..35ba228 100644
--- a/src/main/kotlin/repository/AudioRepository.kt
+++ b/src/main/kotlin/repository/AudioRepository.kt
@@ -4,10 +4,7 @@
 
 package net.piedpiper.bremer.repository
 
-import net.piedpiper.bremer.dao.AlbumDao
-import net.piedpiper.bremer.dao.ArtistDao
-import net.piedpiper.bremer.dao.AudioDao
-import net.piedpiper.bremer.dao.AudioPlayHistoryDao
+import net.piedpiper.bremer.dao.*
 import net.piedpiper.bremer.entity.AudioEntity
 import net.piedpiper.bremer.entity.AudioPlayHistoryEntity
 import org.springframework.beans.factory.annotation.Qualifier
@@ -22,6 +19,8 @@
     private val artistDao: ArtistDao,
     @Qualifier("bremer.dao.AlbumDao")
     private val albumDao: AlbumDao,
+    @Qualifier("bremer.dao.TagDao")
+    private val tagDao: TagDao,
     @Qualifier("bremer.dao.AudioPlayHistoryDao")
     private val audioPlayHistoryDao: AudioPlayHistoryDao
 ) {
@@ -55,6 +54,12 @@
             .findAllByAlbumIdIn(albums.map { it.id }) else emptyList()
     }
 
+    fun findAllByTagLikeLimit(tagNameLike: String, limit: Int): List<AudioEntity> {
+        val tags = tagDao.findAllByNameLikeLimit(tagNameLike, limit);
+        return if (tags.isNotEmpty()) audioDao
+            .findAllByTagIdIn(tags.map { it.id }) else emptyList()
+    }
+
     fun findAllLruLimit(limit: Int): List<AudioEntity> {
         val historyMap = audioPlayHistoryDao.findAllOrderLastPlayedAtDescLimit(limit)
             .associateBy { it.audioId }
diff --git a/src/main/kotlin/repository/PlaylistRepository.kt b/src/main/kotlin/repository/PlaylistRepository.kt
index cb85ea2..8b97392 100644
--- a/src/main/kotlin/repository/PlaylistRepository.kt
+++ b/src/main/kotlin/repository/PlaylistRepository.kt
@@ -9,7 +9,6 @@
 import net.piedpiper.bremer.entity.PlaylistEntity
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.stereotype.Repository
-import org.springframework.transaction.annotation.Transactional
 
 @Repository("bremer.repository.PlaylistRepository")
 class PlaylistRepository(
@@ -21,9 +20,9 @@
 
     fun findOneById(id: Long): PlaylistEntity? = playlistDao.findOneById(id)
 
-    fun findBySlug(slug: String): PlaylistEntity? = playlistDao.findOneBySlug(slug)
+    fun findOneBySlug(slug: String): PlaylistEntity? = playlistDao.findOneBySlug(slug)
 
-    fun findAll(): List<PlaylistEntity> = playlistDao.findAll()
+    fun findAll(): List<PlaylistEntity> = playlistDao.findAllOrderBySequence()
 
     fun insertOne(playlist: PlaylistEntity): Long {
         playlistDao.insertOne(playlist)
@@ -34,17 +33,21 @@
         return playlist.id
     }
 
-    fun updateOne(playlist: PlaylistEntity) {
+    fun deleteOneBySlug(slug: String) {
+        playlistDao.deleteBySlug(slug)
+    }
+
+    fun updateOne(entities: PlaylistEntity) {
         // playlist
-        playlistDao.updateOne(playlist)
+        playlistDao.updateOne(entities)
         // playlist_audio
-        val oldAudio = playlistDao.findOneById(playlist.id)
+        val oldAudio = playlistDao.findOneById(entities.id)
             ?.playlistAudio
             ?.associate { it.id to it }
             ?.toMutableMap()
             ?: mutableMapOf()
         val oldSize = oldAudio?.size ?: 0
-        playlist?.playlistAudio?.forEachIndexed { idx, entity ->
+        entities?.playlistAudio?.forEachIndexed { idx, entity ->
             if (idx >= oldSize) {
                 playlistAudioDao.insertOne(entity)
             } else {
@@ -52,10 +55,14 @@
                 oldAudio.remove(entity.id)
             }
         }
-        deleteAllByIds(oldAudio.keys.toList())
+        deleteAllPlaylistAudioByPlaylistAudioIds(oldAudio.keys.toList())
     }
 
-    fun deleteAllByIds(ids: List<Long>) {
+    fun updateOneWithoutSub(entity: PlaylistEntity) {
+        playlistDao.updateOne(entity)
+    }
+
+    private fun deleteAllPlaylistAudioByPlaylistAudioIds(ids: List<Long>) {
         if (ids.isNotEmpty()) {
             playlistAudioDao.deleteAllByIds(ids)
         }
diff --git a/src/main/kotlin/repository/UserRepository.kt b/src/main/kotlin/repository/UserRepository.kt
index b010959..461e97b 100644
--- a/src/main/kotlin/repository/UserRepository.kt
+++ b/src/main/kotlin/repository/UserRepository.kt
@@ -14,5 +14,5 @@
     @Qualifier("bremer.dao.UserDao")
     private val userDao: UserDao
 ) {
-    fun findByName(name: String): UserEntity? = userDao.findByName(name)
+    fun findOneByName(name: String): UserEntity? = userDao.findByName(name)
 }
\ No newline at end of file
diff --git a/src/main/kotlin/service/AudioService.kt b/src/main/kotlin/service/AudioService.kt
new file mode 100644
index 0000000..28c50da
--- /dev/null
+++ b/src/main/kotlin/service/AudioService.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2023. yo-saito. All Rights Reserved.
+ */
+
+package net.piedpiper.bremer.service
+
+import net.piedpiper.bremer.entity.AudioEntity
+import net.piedpiper.bremer.entity.AudioPlayHistoryEntity
+import net.piedpiper.bremer.exception.NotFoundException
+import net.piedpiper.bremer.model.api.AudioListResponse
+import net.piedpiper.bremer.repository.AudioRepository
+import org.springframework.beans.factory.annotation.Qualifier
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+import java.io.File
+import java.time.LocalDateTime
+import java.time.ZoneId
+
+@Service("bremer.service.AudioService")
+class AudioService(
+    @Qualifier("bremer.repository.AudioRepository")
+    private val audioRepository: AudioRepository
+) {
+    companion object {
+        private const val PAGE_LIMIT = 50
+    }
+
+    @Transactional
+    fun getAudioFile(slug: String): File {
+        val audio = audioRepository.findOneBySlug(slug) ?: throw NotFoundException()
+        val file = File(audio.path)
+        if (!file.exists()) {
+            throw NotFoundException()
+        }
+        audioRepository.saveAudioPlayHistory(
+            AudioPlayHistoryEntity(
+                audioId = audio.id,
+                lastPlayedAt = LocalDateTime.now(ZoneId.of("Asia/Tokyo"))
+            )
+        )
+        return file
+    }
+
+    @Transactional
+    fun getLeastRecentlyAccessedAudio(): AudioListResponse =
+        AudioListResponse(audioRepository.findAllLruLimit(PAGE_LIMIT))
+
+    @Transactional
+    fun getByKeywords(
+        audioNameLike: String?,
+        artistNameLike: String?,
+        albumNameLike: String?,
+        tagNameLike: String?
+    ): AudioListResponse {
+        val set = mutableSetOf<AudioEntity>()
+        if (audioNameLike?.isNotEmpty() == true) {
+            set.addAll(audioRepository.findAllByNameLikeLimit(audioNameLike, PAGE_LIMIT))
+        }
+        if (artistNameLike?.isNotEmpty() == true) {
+            set.addAll(audioRepository.findAllByArtistNameLikeLimit(artistNameLike, PAGE_LIMIT))
+        }
+        if (albumNameLike?.isNotEmpty() == true) {
+            set.addAll(audioRepository.findAllByAlbumNameLikeLimit(albumNameLike, PAGE_LIMIT))
+        }
+        if (tagNameLike?.isNotEmpty() == true) {
+            set.addAll(audioRepository.findAllByTagLikeLimit(tagNameLike, PAGE_LIMIT))
+        }
+        return AudioListResponse(
+            set.sortedWith(compareBy({ it.albumId }, { it.sequence }))
+                .take(PAGE_LIMIT)
+                .toList()
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/service/LoginService.kt b/src/main/kotlin/service/LoginService.kt
new file mode 100644
index 0000000..74a3ff7
--- /dev/null
+++ b/src/main/kotlin/service/LoginService.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2023. yo-saito. All Rights Reserved.
+ */
+
+package net.piedpiper.bremer.service
+
+import net.piedpiper.bremer.model.api.BremerUser
+import net.piedpiper.bremer.repository.UserRepository
+import org.springframework.beans.factory.annotation.Qualifier
+import org.springframework.security.core.userdetails.UserDetails
+import org.springframework.security.core.userdetails.UserDetailsService
+import org.springframework.security.core.userdetails.UsernameNotFoundException
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+
+@Service("bremer.service.LoginService")
+class LoginService(
+    @Qualifier("bremer.dao.UserRepository")
+    private val userRepository: UserRepository
+) : UserDetailsService {
+
+    @Transactional
+    override fun loadUserByUsername(name: String?): UserDetails? = name?.let {
+        userRepository.findOneByName(name)?.let { BremerUser(it) }
+    } ?: throw UsernameNotFoundException("Login failed!")
+}
\ No newline at end of file
diff --git a/src/main/kotlin/service/PlaylistService.kt b/src/main/kotlin/service/PlaylistService.kt
new file mode 100644
index 0000000..8bc7d74
--- /dev/null
+++ b/src/main/kotlin/service/PlaylistService.kt
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2023. yo-saito. All Rights Reserved.
+ */
+
+package net.piedpiper.bremer.service
+
+import net.piedpiper.bremer.entity.AudioEntity
+import net.piedpiper.bremer.entity.PlaylistAudioEntity
+import net.piedpiper.bremer.entity.PlaylistEntity
+import net.piedpiper.bremer.exception.BadRequestException
+import net.piedpiper.bremer.exception.NotFoundException
+import net.piedpiper.bremer.model.api.PlaylistAudioResponse
+import net.piedpiper.bremer.model.api.PlaylistListResponse
+import net.piedpiper.bremer.model.api.PlaylistRequest
+import net.piedpiper.bremer.repository.AudioRepository
+import net.piedpiper.bremer.repository.PlaylistRepository
+import org.springframework.beans.factory.annotation.Qualifier
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+import java.util.UUID
+
+@Service("bremer.service.PlaylistService")
+class PlaylistService(
+    @Qualifier("bremer.repository.PlaylistRepository")
+    private val playlistRepository: PlaylistRepository,
+    @Qualifier("bremer.repository.AudioRepository")
+    private val audioRepository: AudioRepository
+) {
+    @Transactional
+    fun getAllPlaylists(): PlaylistListResponse =
+        PlaylistListResponse(playlistRepository.findAll())
+
+    @Transactional
+    fun getPlaylist(slug: String): PlaylistAudioResponse =
+        convertToPlaylistAudioResponse(
+            playlistRepository.findOneBySlug(slug) ?: throw NotFoundException()
+        )
+
+    // tmp
+    private fun findAllByOrderedIds(ids: List<Long>): List<AudioEntity> {
+        val id2idx = ids.mapIndexed { index, id -> id to index }.toMap()
+        return audioRepository.findAllByIdIn(ids)
+            .sortedBy { id2idx[it.id] }
+    }
+
+    // tmp
+    private fun findAllByOrderedSlugs(slugs: List<String>): List<AudioEntity> {
+        if (slugs.isEmpty()) {
+            return emptyList()
+        }
+        val slug2idx = slugs.mapIndexed { index, slug -> slug to index }.toMap()
+        return audioRepository.findAllBySlugIn(slugs)
+            .sortedBy { slug2idx[it.slug] }
+    }
+
+    @Transactional
+    fun createPlaylist(request: PlaylistRequest): PlaylistAudioResponse =
+        playlistRepository.findOneById(
+            playlistRepository.insertOne(
+                convertToPlaylistEntity(request)
+            )
+        )?.let { entity ->
+            val audioList = entity.playlistAudio?.mapNotNull { it.audioId }
+                ?.let {
+                    findAllByOrderedIds(it)
+                } ?: emptyList()
+            PlaylistAudioResponse(
+                playlistEntity = entity,
+                audioEntityList = audioList
+            )
+        } ?: throw IllegalStateException("TBD")
+
+    @Transactional
+    fun updatePlaylist(slug: String, request: PlaylistRequest): PlaylistAudioResponse =
+        playlistRepository.findOneBySlug(slug)
+            ?.let { playlist ->
+                playlist.name = request.name
+                val audioList = findAllByOrderedSlugs(request.audioSlugs)
+                if (request.audioSlugs.size != audioList.size) {
+                    throw BadRequestException()
+                }
+                val playlistSize = playlist.playlistAudio?.size ?: 0
+                playlist.playlistAudio = audioList.mapIndexed { idx, audio ->
+                    PlaylistAudioEntity(
+                        id = if (idx >= playlistSize) 0L else playlist?.playlistAudio!![idx].id,
+                        playlistId = playlist.id,
+                        sequence = idx,
+                        audioId = audio.id
+                    )
+                }
+                playlistRepository.updateOne(
+                    playlist
+                ).let {
+                    PlaylistAudioResponse(
+                        playlistEntity = playlist,
+                        audioEntityList = audioList
+                    )
+                }
+            } ?: throw NotFoundException()
+
+    @Transactional
+    fun reorder() {
+        playlistRepository.findAll()
+            .forEachIndexed { idx, entity ->
+                entity.sequence = idx + 1
+            }
+    }
+
+    private fun convertToPlaylistEntity(
+        request: PlaylistRequest,
+        id: Long = 0L,
+        slug: String? = null
+    ): PlaylistEntity =
+        request.audioSlugs?.let {
+            findAllByOrderedSlugs(it)
+        }?.associate { it.slug to it.id }
+            .let { audioIdMap ->
+                PlaylistEntity(
+                    id = id,
+                    slug = slug ?: UUID.randomUUID().toString(),
+                    name = request.name,
+                    playlistAudio = request.audioSlugs?.mapIndexed { idx, slug ->
+                        PlaylistAudioEntity(
+                            audioId = audioIdMap?.get(slug) ?: 0L,
+                            sequence = idx
+                        )
+                    } ?: emptyList()
+                )
+            }
+
+    private fun convertToPlaylistAudioResponse(entity: PlaylistEntity): PlaylistAudioResponse {
+        val audioList = entity?.playlistAudio?.mapNotNull { it.audioId }
+            ?.let {
+                findAllByOrderedIds(it)
+            } ?: emptyList()
+        return PlaylistAudioResponse(
+            playlistEntity = entity,
+            audioEntityList = audioList
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/service/app/AudioAppService.kt b/src/main/kotlin/service/app/AudioAppService.kt
deleted file mode 100644
index 3729b42..0000000
--- a/src/main/kotlin/service/app/AudioAppService.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2023. yo-saito. All Rights Reserved.
- */
-
-package net.piedpiper.bremer.service.app
-
-import net.piedpiper.bremer.entity.AudioPlayHistoryEntity
-import net.piedpiper.bremer.exception.NotFoundException
-import net.piedpiper.bremer.model.api.AudioListResponse
-import net.piedpiper.bremer.service.domain.AudioDomainService
-import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-import java.io.File
-import java.time.LocalDateTime
-import java.time.ZoneId
-
-@Service("bremer.service.AudioAppService")
-class AudioAppService(
-    @Qualifier("bremer.service.AudioDomainService")
-    private val audioDomainService: AudioDomainService,
-) {
-    companion object {
-        private const val PAGE_LIMIT = 50
-    }
-
-    @Transactional
-    fun getAudioFile(slug: String): File {
-        val audio = audioDomainService.findOneBySlug(slug) ?: throw NotFoundException()
-        val file = File(audio.path)
-        if (!file.exists()) {
-            throw NotFoundException()
-        }
-        audioDomainService.savePlayedHistory(
-            AudioPlayHistoryEntity(
-                audioId = audio.id,
-                lastPlayedAt = LocalDateTime.now(ZoneId.of("Asia/Tokyo"))
-            )
-        )
-        return file
-    }
-
-    @Transactional
-    fun getLeastRecentlyAccessedAudio(): AudioListResponse =
-        AudioListResponse(audioDomainService.findAllLruLimit(PAGE_LIMIT))
-
-    @Transactional
-    fun getByKeywords(
-        audioName: String?,
-        artistName: String?,
-        albumName: String?
-    ): AudioListResponse =
-        AudioListResponse(
-            audioDomainService.findAllByKeyword(
-                audioName,
-                artistName,
-                albumName,
-                PAGE_LIMIT
-            )
-        )
-}
\ No newline at end of file
diff --git a/src/main/kotlin/service/app/LoginAppService.kt b/src/main/kotlin/service/app/LoginAppService.kt
deleted file mode 100644
index 79ac208..0000000
--- a/src/main/kotlin/service/app/LoginAppService.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2023. yo-saito. All Rights Reserved.
- */
-
-package net.piedpiper.bremer.service.app
-
-import net.piedpiper.bremer.model.api.BremerUser
-import net.piedpiper.bremer.service.domain.UserDomainService
-import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.security.core.userdetails.UserDetails
-import org.springframework.security.core.userdetails.UserDetailsService
-import org.springframework.security.core.userdetails.UsernameNotFoundException
-import org.springframework.security.crypto.password.PasswordEncoder
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-
-@Service("bremer.service.LoginAppService")
-class LoginAppService(
-    private val passwordEncoder: PasswordEncoder,
-    @Qualifier("bremer.dao.UserDomainService")
-    private val userDomainService: UserDomainService
-) : UserDetailsService {
-
-    @Transactional
-    override fun loadUserByUsername(name: String?): UserDetails? = name?.let {
-        userDomainService.findUserByName(name)?.let { BremerUser(it) }
-    } ?: throw UsernameNotFoundException("Login failed!")
-}
\ No newline at end of file
diff --git a/src/main/kotlin/service/app/PlaylistAppService.kt b/src/main/kotlin/service/app/PlaylistAppService.kt
deleted file mode 100644
index ab3e100..0000000
--- a/src/main/kotlin/service/app/PlaylistAppService.kt
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2023. yo-saito. All Rights Reserved.
- */
-
-package net.piedpiper.bremer.service.app
-
-import net.piedpiper.bremer.entity.PlaylistAudioEntity
-import net.piedpiper.bremer.entity.PlaylistEntity
-import net.piedpiper.bremer.exception.BadRequestException
-import net.piedpiper.bremer.exception.NotFoundException
-import net.piedpiper.bremer.model.PlaylistAudioResponse
-import net.piedpiper.bremer.model.PlaylistListResponse
-import net.piedpiper.bremer.model.PlaylistRequest
-import net.piedpiper.bremer.service.domain.AudioDomainService
-import net.piedpiper.bremer.service.domain.PlaylistDomainService
-import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-import java.util.UUID
-
-@Service("bremer.service.PlaylistAppService")
-class PlaylistAppService(
-    @Qualifier("bremer.service.PlaylistDomainService")
-    private val playlistDomainService: PlaylistDomainService,
-    @Qualifier("bremer.service.AudioDomainService")
-    private val audioDomainService: AudioDomainService
-) {
-    @Transactional
-    fun getAllPlaylists(): PlaylistListResponse =
-        PlaylistListResponse(playlistDomainService.findAll())
-
-    @Transactional
-    fun getPlaylist(slug: String): PlaylistAudioResponse =
-        convertToPlaylistAudioResponse(
-            playlistDomainService.findOneBySlug(slug) ?: throw NotFoundException()
-        )
-
-    @Transactional
-    fun createPlaylist(request: PlaylistRequest): PlaylistAudioResponse =
-        playlistDomainService.insertOne(
-            convertToPlaylistEntity(request)
-        ).let { entity ->
-            val audioList = entity?.playlistAudio?.mapNotNull { it.audioId }
-                ?.let {
-                    audioDomainService.findAllByOrderedIds(it)
-                } ?: emptyList()
-            PlaylistAudioResponse(
-                playlistEntity = entity,
-                audioEntityList = audioList
-            )
-        }
-
-    @Transactional
-    fun updatePlaylist(slug: String, request: PlaylistRequest): PlaylistAudioResponse =
-        playlistDomainService.findOneBySlug(slug)
-            ?.let { playlist ->
-                playlist.name = request.name
-                val audioList = audioDomainService.findAllByOrderedSlugs(request.audioSlugs)
-                if (request.audioSlugs.size != audioList.size) {
-                    throw BadRequestException()
-                }
-                val playlistSize = playlist.playlistAudio?.size ?: 0
-                playlist.playlistAudio = audioList.mapIndexed { idx, audio ->
-                    PlaylistAudioEntity(
-                        id = if (idx >= playlistSize) 0L else playlist?.playlistAudio!![idx].id,
-                        playlistId = playlist.id,
-                        sequence = idx,
-                        audioId = audio.id
-                    )
-                }
-                playlistDomainService.updateOne(
-                    playlist
-                ).let {
-                    PlaylistAudioResponse(
-                        playlistEntity = playlist,
-                        audioEntityList = audioList
-                    )
-                }
-            } ?: throw NotFoundException()
-
-    private fun convertToPlaylistEntity(
-        request: PlaylistRequest,
-        id: Long = 0L,
-        slug: String? = null
-    ): PlaylistEntity =
-        request.audioSlugs?.let {
-            audioDomainService.findAllByOrderedSlugs(it)
-        }?.associate { it.slug to it.id }
-            .let { audioIdMap ->
-                PlaylistEntity(
-                    id = id,
-                    slug = slug ?: UUID.randomUUID().toString(),
-                    name = request.name,
-                    playlistAudio = request.audioSlugs?.mapIndexed { idx, slug ->
-                        PlaylistAudioEntity(
-                            audioId = audioIdMap?.get(slug) ?: 0L,
-                            sequence = idx
-                        )
-                    } ?: emptyList()
-                )
-            }
-
-    private fun convertToPlaylistAudioResponse(entity: PlaylistEntity): PlaylistAudioResponse {
-        val audioList = entity?.playlistAudio?.mapNotNull { it.audioId }
-            ?.let {
-                audioDomainService.findAllByOrderedIds(it)
-            } ?: emptyList()
-        return PlaylistAudioResponse(
-            playlistEntity = entity,
-            audioEntityList = audioList
-        )
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/service/domain/AudioDomainService.kt b/src/main/kotlin/service/domain/AudioDomainService.kt
deleted file mode 100644
index 954c2d8..0000000
--- a/src/main/kotlin/service/domain/AudioDomainService.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2023. yo-saito. All Rights Reserved.
- */
-
-package net.piedpiper.bremer.service.domain
-
-import net.piedpiper.bremer.config.Log
-import net.piedpiper.bremer.entity.AudioEntity
-import net.piedpiper.bremer.entity.AudioPlayHistoryEntity
-import net.piedpiper.bremer.repository.AudioRepository
-import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-
-@Service("bremer.service.AudioDomainService")
-class AudioDomainService(
-    @Qualifier("bremer.repository.AudioRepository")
-    private val audioRepository: AudioRepository,
-) {
-    private val log by Log()
-
-    @Transactional
-    fun findOneBySlug(slug: String): AudioEntity? {
-        val a = audioRepository.findOneBySlug(slug)
-        log.info("audio: {}", a)
-        return a
-    }
-
-    @Transactional
-    fun findAllByOrderedIds(ids: List<Long>): List<AudioEntity> {
-        val id2idx = ids.mapIndexed { index, id -> id to index }.toMap()
-        return audioRepository.findAllByIdIn(ids)
-            .sortedBy { id2idx[it.id] }
-    }
-
-    @Transactional
-    fun findAllByOrderedSlugs(slugs: List<String>): List<AudioEntity> {
-        if (slugs.isEmpty()) {
-            return emptyList()
-        }
-        val slug2idx = slugs.mapIndexed { index, slug -> slug to index }.toMap()
-        return audioRepository.findAllBySlugIn(slugs)
-            .sortedBy { slug2idx[it.slug] }
-    }
-
-    @Transactional
-    fun findAllLruLimit(limit: Int): List<AudioEntity> = audioRepository.findAllLruLimit(limit)
-
-    @Transactional
-    fun findAllByKeyword(
-        nameLike: String?,
-        artistNameLike: String?,
-        albumNameLike: String?,
-        limit: Int
-    ): List<AudioEntity> {
-        val set = mutableSetOf<AudioEntity>()
-        if (nameLike?.isNotEmpty() == true) {
-            set.addAll(audioRepository.findAllByNameLikeLimit(nameLike, limit))
-        }
-        if (artistNameLike?.isNotEmpty() == true) {
-            set.addAll(audioRepository.findAllByArtistNameLikeLimit(artistNameLike, limit))
-        }
-        if (albumNameLike?.isNotEmpty() == true) {
-            set.addAll(audioRepository.findAllByAlbumNameLikeLimit(albumNameLike, limit))
-        }
-        return set.take(limit).sortedByDescending { it.id }.toList()
-    }
-
-    fun savePlayedHistory(entity: AudioPlayHistoryEntity) =
-        audioRepository.saveAudioPlayHistory(entity)
-}
\ No newline at end of file
diff --git a/src/main/kotlin/service/domain/PlaylistDomainService.kt b/src/main/kotlin/service/domain/PlaylistDomainService.kt
deleted file mode 100644
index 75b25c2..0000000
--- a/src/main/kotlin/service/domain/PlaylistDomainService.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2023. yo-saito. All Rights Reserved.
- */
-
-package net.piedpiper.bremer.service.domain
-
-import net.piedpiper.bremer.entity.PlaylistEntity
-import net.piedpiper.bremer.repository.PlaylistRepository
-import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-import java.util.*
-
-@Service("bremer.service.PlaylistDomainService")
-class PlaylistDomainService(
-    private val playlistRepository: PlaylistRepository
-) {
-    @Transactional
-    fun findAll(): List<PlaylistEntity> = playlistRepository.findAll()
-
-    @Transactional
-    fun findOneBySlug(slug: String): PlaylistEntity? = playlistRepository.findBySlug(slug)
-
-    @Transactional
-    fun insertOne(entity: PlaylistEntity): PlaylistEntity = playlistRepository.insertOne(entity)
-        .let { playlistRepository.findOneById(it) ?: throw IllegalStateException() }
-
-    @Transactional
-    fun updateOne(entity: PlaylistEntity): PlaylistEntity {
-        playlistRepository.updateOne(entity)
-        return playlistRepository.findOneById(entity.id) ?: throw IllegalStateException()
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/service/domain/UserDomainService.kt b/src/main/kotlin/service/domain/UserDomainService.kt
deleted file mode 100644
index cbed92d..0000000
--- a/src/main/kotlin/service/domain/UserDomainService.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2023. yo-saito. All Rights Reserved.
- */
-
-package net.piedpiper.bremer.service.domain
-
-import net.piedpiper.bremer.entity.UserEntity
-import net.piedpiper.bremer.repository.UserRepository
-import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.stereotype.Service
-
-@Service("bremer.dao.UserDomainService")
-class UserDomainService(
-    @Qualifier("bremer.dao.UserRepository")
-    private val userRepository: UserRepository
-) {
-    fun findUserByName(name: String): UserEntity? = userRepository.findByName(name)
-}
\ No newline at end of file
diff --git a/src/main/resources/mapper/mapper.xml b/src/main/resources/mapper/mapper.xml
index c9d9730..fc01a97 100644
--- a/src/main/resources/mapper/mapper.xml
+++ b/src/main/resources/mapper/mapper.xml
@@ -24,6 +24,12 @@
     <result property="name" column="name"/>
   </resultMap>
 
+  <resultMap id="AudioTagEntity" type="net.piedpiper.bremer.entity.AudioTagEntity">
+    <id property="id" column="id"/>
+    <result property="audioId" column="audio_id"/>
+    <result property="tagId" column="tag_id"/>
+  </resultMap>
+
   <resultMap id="AlbumEntity" type="net.piedpiper.bremer.entity.AlbumEntity">
     <id property="id" column="id"/>
     <result property="artistId" column="artist_id"/>
@@ -59,4 +65,9 @@
     <result property="name" column="name"/>
     <result property="secret" column="secret"/>
   </resultMap>
+
+  <resultMap id="TagEntity" type="net.piedpiper.bremer.entity.TagEntity">
+    <id property="id" column="id"/>
+    <result property="name" column="name"/>
+  </resultMap>
 </mapper>