diff --git a/server/app/src/main/kotlin/mu/muse/application/MvcConfiguration.kt b/server/app/src/main/kotlin/mu/muse/application/MvcConfiguration.kt
index 1c69f7e2..14d4a15d 100644
--- a/server/app/src/main/kotlin/mu/muse/application/MvcConfiguration.kt
+++ b/server/app/src/main/kotlin/mu/muse/application/MvcConfiguration.kt
@@ -1,8 +1,6 @@
 package mu.muse.application
 
-import com.fasterxml.jackson.annotation.JsonInclude
-import com.fasterxml.jackson.databind.ObjectMapper
-import mu.muse.common.rest.GlobalErrorHandler
+import mu.muse.rest.GlobalErrorHandler
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 
diff --git a/server/app/src/main/kotlin/mu/muse/common/rest/GlobalErrorHandler.kt b/server/app/src/main/kotlin/mu/muse/rest/GlobalErrorHandler.kt
similarity index 93%
rename from server/app/src/main/kotlin/mu/muse/common/rest/GlobalErrorHandler.kt
rename to server/app/src/main/kotlin/mu/muse/rest/GlobalErrorHandler.kt
index 3905c78d..2f2b8784 100644
--- a/server/app/src/main/kotlin/mu/muse/common/rest/GlobalErrorHandler.kt
+++ b/server/app/src/main/kotlin/mu/muse/rest/GlobalErrorHandler.kt
@@ -1,7 +1,9 @@
-package mu.muse.common.rest
+package mu.muse.rest
 
 import mu.muse.rest.dto.ClientError
 import mu.muse.rest.dto.ServerError
+import mu.muse.usecase.ClientException
+import mu.muse.usecase.ServerException
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.http.ResponseEntity
diff --git a/server/app/src/main/kotlin/mu/muse/usecase/AddFavorite.kt b/server/app/src/main/kotlin/mu/muse/usecase/AddFavorite.kt
index 93eb3ce2..d12cf09d 100644
--- a/server/app/src/main/kotlin/mu/muse/usecase/AddFavorite.kt
+++ b/server/app/src/main/kotlin/mu/muse/usecase/AddFavorite.kt
@@ -1,6 +1,5 @@
 package mu.muse.usecase
 
-import mu.muse.common.rest.ServerException
 import mu.muse.common.types.BusinessError
 import mu.muse.domain.instrument.InstrumentId
 import mu.muse.domain.user.Username
diff --git a/server/app/src/main/kotlin/mu/muse/usecase/BasicLogin.kt b/server/app/src/main/kotlin/mu/muse/usecase/BasicLogin.kt
index 1ed46aa8..7f1b327f 100644
--- a/server/app/src/main/kotlin/mu/muse/usecase/BasicLogin.kt
+++ b/server/app/src/main/kotlin/mu/muse/usecase/BasicLogin.kt
@@ -1,6 +1,5 @@
 package mu.muse.usecase
 
-import mu.muse.common.rest.ServerException
 import mu.muse.common.types.BusinessError
 import mu.muse.domain.user.Password
 import mu.muse.domain.user.Username
diff --git a/server/app/src/main/kotlin/mu/muse/usecase/GetFavoriteByUsername.kt b/server/app/src/main/kotlin/mu/muse/usecase/GetFavoriteByUsername.kt
index 0828e3b5..05580664 100644
--- a/server/app/src/main/kotlin/mu/muse/usecase/GetFavoriteByUsername.kt
+++ b/server/app/src/main/kotlin/mu/muse/usecase/GetFavoriteByUsername.kt
@@ -1,6 +1,5 @@
 package mu.muse.usecase
 
-import mu.muse.common.rest.ServerException
 import mu.muse.common.types.BusinessError
 import mu.muse.domain.instrument.Instrument
 import mu.muse.domain.user.Username
diff --git a/server/app/src/main/kotlin/mu/muse/usecase/GetUser.kt b/server/app/src/main/kotlin/mu/muse/usecase/GetUser.kt
index bc4a0a81..6c78f345 100644
--- a/server/app/src/main/kotlin/mu/muse/usecase/GetUser.kt
+++ b/server/app/src/main/kotlin/mu/muse/usecase/GetUser.kt
@@ -1,6 +1,5 @@
 package mu.muse.usecase
 
-import mu.muse.common.rest.ServerException
 import mu.muse.common.types.BusinessError
 import mu.muse.domain.user.User
 import mu.muse.domain.user.Username
diff --git a/server/app/src/main/kotlin/mu/muse/usecase/RemoveFavorite.kt b/server/app/src/main/kotlin/mu/muse/usecase/RemoveFavorite.kt
index 6431afd8..a6ab7ab8 100644
--- a/server/app/src/main/kotlin/mu/muse/usecase/RemoveFavorite.kt
+++ b/server/app/src/main/kotlin/mu/muse/usecase/RemoveFavorite.kt
@@ -1,6 +1,5 @@
 package mu.muse.usecase
 
-import mu.muse.common.rest.ServerException
 import mu.muse.common.types.BusinessError
 import mu.muse.domain.instrument.InstrumentId
 import mu.muse.domain.user.Username
diff --git a/server/app/src/main/kotlin/mu/muse/usecase/access/instrument/InstrumentExtractor.kt b/server/app/src/main/kotlin/mu/muse/usecase/access/instrument/InstrumentExtractor.kt
index 7e9667a5..e8b03e4e 100644
--- a/server/app/src/main/kotlin/mu/muse/usecase/access/instrument/InstrumentExtractor.kt
+++ b/server/app/src/main/kotlin/mu/muse/usecase/access/instrument/InstrumentExtractor.kt
@@ -1,6 +1,6 @@
 package mu.muse.usecase.access.instrument
 
-import mu.muse.common.rest.ServerException
+import mu.muse.usecase.ServerException
 import mu.muse.domain.instrument.Country
 import mu.muse.domain.instrument.Instrument
 import mu.muse.domain.instrument.InstrumentId
diff --git a/server/app/src/main/kotlin/mu/muse/common/rest/exceptions.kt b/server/app/src/main/kotlin/mu/muse/usecase/exceptions.kt
similarity index 85%
rename from server/app/src/main/kotlin/mu/muse/common/rest/exceptions.kt
rename to server/app/src/main/kotlin/mu/muse/usecase/exceptions.kt
index 34352698..9e480a9b 100644
--- a/server/app/src/main/kotlin/mu/muse/common/rest/exceptions.kt
+++ b/server/app/src/main/kotlin/mu/muse/usecase/exceptions.kt
@@ -1,4 +1,4 @@
-package mu.muse.common.rest
+package mu.muse.usecase
 
 open class ClientException(override val message: String) : RuntimeException(message)
 open class ServerException(override val message: String) : RuntimeException(message)