diff --git a/src/main/kotlin/Application.kt b/src/main/kotlin/Application.kt
index ba1fbcc..b3ea880 100644
--- a/src/main/kotlin/Application.kt
+++ b/src/main/kotlin/Application.kt
@@ -12,23 +12,23 @@ import fr.dcproject.component.article.routes.findArticleVersions
 import fr.dcproject.component.article.routes.findArticles
 import fr.dcproject.component.article.routes.getOneArticle
 import fr.dcproject.component.article.routes.upsertArticle
-import fr.dcproject.component.citizen.routes.changeMyPassword
-import fr.dcproject.component.citizen.routes.findCitizen
-import fr.dcproject.component.citizen.routes.getCurrentCitizen
-import fr.dcproject.component.citizen.routes.getOneCitizen
-import fr.dcproject.component.comment.generic.routes.createCommentChildren
-import fr.dcproject.component.comment.generic.routes.editComment
-import fr.dcproject.component.comment.generic.routes.getChildrenComments
-import fr.dcproject.component.comment.generic.routes.getOneComment
-import fr.dcproject.elasticsearch.configElasticIndexes
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserRepository
 import fr.dcproject.component.auth.routes.authLogin
 import fr.dcproject.component.auth.routes.authRegister
 import fr.dcproject.component.auth.routes.authSso
+import fr.dcproject.component.citizen.routes.changeMyPassword
+import fr.dcproject.component.citizen.routes.findCitizen
+import fr.dcproject.component.citizen.routes.getCurrentCitizen
+import fr.dcproject.component.citizen.routes.getOneCitizen
 import fr.dcproject.component.comment.article.routes.createCommentArticle
 import fr.dcproject.component.comment.article.routes.getArticleComments
 import fr.dcproject.component.comment.article.routes.getCitizenArticleComments
+import fr.dcproject.component.comment.generic.routes.createCommentChildren
+import fr.dcproject.component.comment.generic.routes.editComment
+import fr.dcproject.component.comment.generic.routes.getChildrenComments
+import fr.dcproject.component.comment.generic.routes.getOneComment
+import fr.dcproject.elasticsearch.configElasticIndexes
 import fr.dcproject.event.EventNotification
 import fr.dcproject.event.EventSubscriber
 import fr.dcproject.routes.*
diff --git a/src/main/kotlin/ApplicationContext.kt b/src/main/kotlin/ApplicationContext.kt
index 8de94a5..5257ff1 100644
--- a/src/main/kotlin/ApplicationContext.kt
+++ b/src/main/kotlin/ApplicationContext.kt
@@ -1,8 +1,8 @@
 package fr.dcproject
 
-import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
+import fr.dcproject.component.citizen.CitizenRepository
 import io.ktor.application.*
 import io.ktor.auth.*
 import io.ktor.util.*
diff --git a/src/main/kotlin/Configuration.kt b/src/main/kotlin/Configuration.kt
index 9ebc161..e558fa0 100644
--- a/src/main/kotlin/Configuration.kt
+++ b/src/main/kotlin/Configuration.kt
@@ -5,8 +5,8 @@ import com.auth0.jwt.JWTVerifier
 import com.auth0.jwt.algorithms.Algorithm
 import com.typesafe.config.ConfigFactory
 import fr.dcproject.component.auth.UserI
-import java.util.*
 import java.net.URI
+import java.util.*
 
 object Config {
     private var config = ConfigFactory.load()
diff --git a/src/main/kotlin/KoinModule.kt b/src/main/kotlin/KoinModule.kt
index 12ae88f..cc656b0 100644
--- a/src/main/kotlin/KoinModule.kt
+++ b/src/main/kotlin/KoinModule.kt
@@ -11,6 +11,8 @@ import com.rabbitmq.client.ConnectionFactory
 import fr.dcproject.component.article.ArticleRepository
 import fr.dcproject.component.article.ArticleViewManager
 import fr.dcproject.component.article.ArticleVoter
+import fr.dcproject.component.auth.SsoManager
+import fr.dcproject.component.auth.UserRepository
 import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.component.citizen.CitizenVoter
 import fr.dcproject.component.comment.article.CommentArticleRepository
@@ -18,8 +20,6 @@ import fr.dcproject.component.comment.generic.CommentVoter
 import fr.dcproject.event.publisher.Publisher
 import fr.dcproject.messages.Mailer
 import fr.dcproject.messages.NotificationEmailSender
-import fr.dcproject.component.auth.SsoManager
-import fr.dcproject.component.auth.UserRepository
 import fr.dcproject.repository.CommentConstitutionRepository
 import fr.postgresjson.connexion.Connection
 import fr.postgresjson.connexion.Requester
diff --git a/src/main/kotlin/component/auth/SsoManager.kt b/src/main/kotlin/component/auth/SsoManager.kt
index 6a8aa45..f3613e5 100644
--- a/src/main/kotlin/component/auth/SsoManager.kt
+++ b/src/main/kotlin/component/auth/SsoManager.kt
@@ -4,7 +4,6 @@ import com.sendgrid.helpers.mail.Mail
 import com.sendgrid.helpers.mail.objects.Content
 import com.sendgrid.helpers.mail.objects.Email
 import fr.dcproject.JwtConfig
-import fr.dcproject.component.citizen.CitizenBasicI
 import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.component.citizen.CitizenWithEmail
 import fr.dcproject.component.citizen.CitizenWithUserI
diff --git a/src/main/kotlin/component/auth/UserRepository.kt b/src/main/kotlin/component/auth/UserRepository.kt
index 120f486..c9455cf 100644
--- a/src/main/kotlin/component/auth/UserRepository.kt
+++ b/src/main/kotlin/component/auth/UserRepository.kt
@@ -2,7 +2,7 @@ package fr.dcproject.component.auth
 
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.repository.RepositoryI
-import io.ktor.auth.UserPasswordCredential
+import io.ktor.auth.*
 import java.util.*
 import fr.dcproject.component.auth.User as UserEntity
 
diff --git a/src/main/kotlin/component/auth/routes/Register.kt b/src/main/kotlin/component/auth/routes/Register.kt
index 3714ad4..b83ae01 100644
--- a/src/main/kotlin/component/auth/routes/Register.kt
+++ b/src/main/kotlin/component/auth/routes/Register.kt
@@ -2,12 +2,12 @@ package fr.dcproject.component.auth.routes
 
 import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
 import fr.dcproject.JwtConfig
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.auth.routes.RegisterRequest.Input
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenRepository
-import fr.dcproject.component.auth.User
-import fr.dcproject.component.auth.UserI
 import io.ktor.application.*
 import io.ktor.features.*
 import io.ktor.http.*
diff --git a/src/main/kotlin/component/auth/routes/Sso.kt b/src/main/kotlin/component/auth/routes/Sso.kt
index 4e30082..d2676b5 100644
--- a/src/main/kotlin/component/auth/routes/Sso.kt
+++ b/src/main/kotlin/component/auth/routes/Sso.kt
@@ -1,7 +1,7 @@
 package fr.dcproject.component.auth.routes
 
-import fr.dcproject.component.auth.routes.SsoRequest.Input
 import fr.dcproject.component.auth.SsoManager
+import fr.dcproject.component.auth.routes.SsoRequest.Input
 import io.ktor.application.*
 import io.ktor.http.*
 import io.ktor.locations.*
diff --git a/src/main/kotlin/component/citizen/Citizen.kt b/src/main/kotlin/component/citizen/Citizen.kt
index 0ba626e..f8b116b 100644
--- a/src/main/kotlin/component/citizen/Citizen.kt
+++ b/src/main/kotlin/component/citizen/Citizen.kt
@@ -1,9 +1,9 @@
 package fr.dcproject.component.citizen
 
-import fr.dcproject.component.citizen.CitizenI.Name
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.auth.UserRef
+import fr.dcproject.component.citizen.CitizenI.Name
 import fr.dcproject.entity.WorkgroupSimple
 import fr.postgresjson.entity.*
 import org.joda.time.DateTime
diff --git a/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt b/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt
index 2c19597..561bfb8 100644
--- a/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt
+++ b/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt
@@ -3,9 +3,9 @@ package fr.dcproject.component.citizen.routes
 import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
 import fr.dcproject.citizen
 import fr.dcproject.citizenOrNull
+import fr.dcproject.component.auth.UserRepository
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenVoter
-import fr.dcproject.component.auth.UserRepository
 import fr.dcproject.voter.assert
 import io.ktor.application.*
 import io.ktor.auth.*
diff --git a/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt b/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt
index f7a932c..d756aca 100644
--- a/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt
+++ b/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt
@@ -10,7 +10,6 @@ import io.ktor.locations.*
 import io.ktor.response.*
 import io.ktor.routing.*
 
-
 @KtorExperimentalLocationsAPI
 @Location("/citizens/{citizen}/comments/articles")
 class CitizenCommentArticleRequest(val citizen: Citizen)
diff --git a/src/main/kotlin/routes/Notification.kt b/src/main/kotlin/routes/Notification.kt
index c79bedf..8adb954 100644
--- a/src/main/kotlin/routes/Notification.kt
+++ b/src/main/kotlin/routes/Notification.kt
@@ -3,12 +3,11 @@ package fr.dcproject.routes
 import fr.dcproject.citizen
 import fr.dcproject.event.Event
 import fr.postgresjson.serializer.deserialize
-import io.ktor.client.HttpClient
-import io.ktor.http.cio.websocket.Frame
-import io.ktor.http.cio.websocket.readText
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.routing.Route
-import io.ktor.websocket.webSocket
+import io.ktor.client.*
+import io.ktor.http.cio.websocket.*
+import io.ktor.locations.*
+import io.ktor.routing.*
+import io.ktor.websocket.*
 import io.lettuce.core.Range
 import io.lettuce.core.api.async.RedisAsyncCommands
 import kotlinx.coroutines.ExperimentalCoroutinesApi
diff --git a/src/main/kotlin/routes/OpenAPI.kt b/src/main/kotlin/routes/OpenAPI.kt
index 7db42ea..5845daa 100644
--- a/src/main/kotlin/routes/OpenAPI.kt
+++ b/src/main/kotlin/routes/OpenAPI.kt
@@ -1,13 +1,12 @@
 package fr.dcproject.routes
 
 import fr.dcproject.utils.readResource
-import io.ktor.application.call
-import io.ktor.http.ContentType
-import io.ktor.locations.KtorExperimentalLocationsAPI
-import io.ktor.response.respondText
-import io.ktor.routing.Route
-import io.ktor.routing.get
-import io.ktor.util.KtorExperimentalAPI
+import io.ktor.application.*
+import io.ktor.http.*
+import io.ktor.locations.*
+import io.ktor.response.*
+import io.ktor.routing.*
+import io.ktor.util.*
 
 @KtorExperimentalLocationsAPI
 @KtorExperimentalAPI
diff --git a/src/main/kotlin/voter/ConstitutionVoter.kt b/src/main/kotlin/voter/ConstitutionVoter.kt
index 953be95..7e6d958 100644
--- a/src/main/kotlin/voter/ConstitutionVoter.kt
+++ b/src/main/kotlin/voter/ConstitutionVoter.kt
@@ -1,8 +1,8 @@
 package fr.dcproject.security.voter
 
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.comment.generic.CommentForView
 import fr.dcproject.entity.ConstitutionSimple
-import fr.dcproject.component.auth.UserI
 import fr.dcproject.user
 import fr.dcproject.voter.NoRuleDefinedException
 import fr.dcproject.voter.NoSubjectDefinedException
diff --git a/src/test/kotlin/steps/CitizenSteps.kt b/src/test/kotlin/steps/CitizenSteps.kt
index 0ee3550..76829cf 100644
--- a/src/test/kotlin/steps/CitizenSteps.kt
+++ b/src/test/kotlin/steps/CitizenSteps.kt
@@ -1,9 +1,9 @@
 package steps
 
+import fr.dcproject.component.auth.User
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenRepository
-import fr.dcproject.component.auth.User
 import io.cucumber.datatable.DataTable
 import io.cucumber.java8.En
 import org.joda.time.DateTime
diff --git a/src/test/kotlin/unit/voter/ArticleVoterTest.kt b/src/test/kotlin/unit/voter/ArticleVoterTest.kt
index 848ee44..16b6b4a 100644
--- a/src/test/kotlin/unit/voter/ArticleVoterTest.kt
+++ b/src/test/kotlin/unit/voter/ArticleVoterTest.kt
@@ -2,10 +2,10 @@ package unit.voter
 
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.article.ArticleVoter
-import fr.dcproject.component.citizen.CitizenCart
-import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserI
+import fr.dcproject.component.citizen.CitizenCart
+import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.voter.Vote.DENIED
 import fr.dcproject.voter.Vote.GRANTED
 import fr.postgresjson.connexion.Paginated
diff --git a/src/test/kotlin/unit/voter/CitizenVoterTest.kt b/src/test/kotlin/unit/voter/CitizenVoterTest.kt
index 84d0fe5..0f939de 100644
--- a/src/test/kotlin/unit/voter/CitizenVoterTest.kt
+++ b/src/test/kotlin/unit/voter/CitizenVoterTest.kt
@@ -1,10 +1,10 @@
 package unit.voter
 
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenVoter
-import fr.dcproject.component.auth.User
-import fr.dcproject.component.auth.UserI
 import fr.dcproject.voter.Vote.DENIED
 import fr.dcproject.voter.Vote.GRANTED
 import io.mockk.mockkStatic
diff --git a/src/test/kotlin/unit/voter/CommentVoterTest.kt b/src/test/kotlin/unit/voter/CommentVoterTest.kt
index 01e4f47..0617a38 100644
--- a/src/test/kotlin/unit/voter/CommentVoterTest.kt
+++ b/src/test/kotlin/unit/voter/CommentVoterTest.kt
@@ -2,14 +2,14 @@ package unit.voter
 
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.article.ArticleRef
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.comment.generic.CommentForUpdate
 import fr.dcproject.component.comment.generic.CommentForView
 import fr.dcproject.component.comment.generic.CommentVoter
-import fr.dcproject.component.auth.User
-import fr.dcproject.component.auth.UserI
 import fr.dcproject.voter.Vote.DENIED
 import fr.dcproject.voter.Vote.GRANTED
 import fr.postgresjson.connexion.Paginated
diff --git a/src/test/kotlin/unit/voter/FollowVoterTest.kt b/src/test/kotlin/unit/voter/FollowVoterTest.kt
index 6956735..c169d42 100644
--- a/src/test/kotlin/unit/voter/FollowVoterTest.kt
+++ b/src/test/kotlin/unit/voter/FollowVoterTest.kt
@@ -2,13 +2,13 @@ package unit.voter
 
 import fr.dcproject.citizenOrNull
 import fr.dcproject.component.article.ArticleForView
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.entity.Follow
-import fr.dcproject.component.auth.User
-import fr.dcproject.component.auth.UserI
 import fr.dcproject.security.voter.FollowVoter
 import fr.dcproject.voter.NoSubjectDefinedException
 import fr.ktorVoter.ActionI
diff --git a/src/test/kotlin/unit/voter/OpinionChoiceVoterTest.kt b/src/test/kotlin/unit/voter/OpinionChoiceVoterTest.kt
index 609ca15..ef3feb3 100644
--- a/src/test/kotlin/unit/voter/OpinionChoiceVoterTest.kt
+++ b/src/test/kotlin/unit/voter/OpinionChoiceVoterTest.kt
@@ -1,12 +1,12 @@
 package unit.voter
 
 import fr.dcproject.component.article.ArticleForView
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.entity.OpinionChoice
-import fr.dcproject.component.auth.User
-import fr.dcproject.component.auth.UserI
 import fr.dcproject.security.voter.OpinionChoiceVoter
 import fr.dcproject.user
 import fr.ktorVoter.ActionI
diff --git a/src/test/kotlin/unit/voter/OpinionVoterTest.kt b/src/test/kotlin/unit/voter/OpinionVoterTest.kt
index 22ab6ea..40ca0ae 100644
--- a/src/test/kotlin/unit/voter/OpinionVoterTest.kt
+++ b/src/test/kotlin/unit/voter/OpinionVoterTest.kt
@@ -1,13 +1,13 @@
 package unit.voter
 
 import fr.dcproject.component.article.ArticleForView
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.entity.Opinion
 import fr.dcproject.entity.OpinionChoice
-import fr.dcproject.component.auth.User
-import fr.dcproject.component.auth.UserI
 import fr.dcproject.security.voter.OpinionVoter
 import fr.dcproject.user
 import fr.dcproject.voter.NoSubjectDefinedException
diff --git a/src/test/kotlin/unit/voter/VoteVoterTest.kt b/src/test/kotlin/unit/voter/VoteVoterTest.kt
index 0404195..ff22a88 100644
--- a/src/test/kotlin/unit/voter/VoteVoterTest.kt
+++ b/src/test/kotlin/unit/voter/VoteVoterTest.kt
@@ -3,12 +3,12 @@ package unit.voter
 import fr.dcproject.citizenOrNull
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.article.ArticleRef
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
-import fr.dcproject.component.auth.User
-import fr.dcproject.component.auth.UserI
 import fr.dcproject.entity.VoteForUpdate
 import fr.dcproject.security.voter.VoteVoter
 import fr.dcproject.voter.NoSubjectDefinedException
diff --git a/src/test/kotlin/unit/voter/WorkgroupVoterTest.kt b/src/test/kotlin/unit/voter/WorkgroupVoterTest.kt
index 23cf6de..cc0440e 100644
--- a/src/test/kotlin/unit/voter/WorkgroupVoterTest.kt
+++ b/src/test/kotlin/unit/voter/WorkgroupVoterTest.kt
@@ -1,11 +1,11 @@
 package unit.voter
 
 import fr.dcproject.component.article.ArticleForView
+import fr.dcproject.component.auth.User
+import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenCart
 import fr.dcproject.component.citizen.CitizenI
-import fr.dcproject.component.auth.User
-import fr.dcproject.component.auth.UserI
 import fr.dcproject.entity.WorkgroupRef
 import fr.dcproject.entity.WorkgroupWithMembersI
 import fr.dcproject.security.voter.WorkgroupVoter