diff --git a/modules/backend/src/main/scala/docspell/backend/fulltext/CreateIndex.scala b/modules/backend/src/main/scala/docspell/backend/fulltext/CreateIndex.scala
index bce169e3..a30e0922 100644
--- a/modules/backend/src/main/scala/docspell/backend/fulltext/CreateIndex.scala
+++ b/modules/backend/src/main/scala/docspell/backend/fulltext/CreateIndex.scala
@@ -8,6 +8,7 @@ package docspell.backend.fulltext
 
 import cats.data.NonEmptyList
 import cats.effect._
+
 import docspell.common._
 import docspell.ftsclient.FtsClient
 import docspell.ftsclient.TextData
diff --git a/modules/fts-psql/src/main/scala/docspell/ftspsql/DbMigration.scala b/modules/fts-psql/src/main/scala/docspell/ftspsql/DbMigration.scala
index b5ce5fd3..fb746587 100644
--- a/modules/fts-psql/src/main/scala/docspell/ftspsql/DbMigration.scala
+++ b/modules/fts-psql/src/main/scala/docspell/ftspsql/DbMigration.scala
@@ -1,7 +1,14 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.ftspsql
 
 import cats.effect._
 import cats.implicits._
+
 import org.flywaydb.core.Flyway
 import org.flywaydb.core.api.output.MigrateResult
 
diff --git a/modules/fts-psql/src/main/scala/docspell/ftspsql/DoobieMeta.scala b/modules/fts-psql/src/main/scala/docspell/ftspsql/DoobieMeta.scala
index fd17df58..1a537ae5 100644
--- a/modules/fts-psql/src/main/scala/docspell/ftspsql/DoobieMeta.scala
+++ b/modules/fts-psql/src/main/scala/docspell/ftspsql/DoobieMeta.scala
@@ -1,6 +1,13 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.ftspsql
 
 import docspell.common._
+
 import doobie._
 import doobie.util.log.Success
 
diff --git a/modules/fts-psql/src/main/scala/docspell/ftspsql/FtsRecord.scala b/modules/fts-psql/src/main/scala/docspell/ftspsql/FtsRecord.scala
index 0b6f48ab..f868b273 100644
--- a/modules/fts-psql/src/main/scala/docspell/ftspsql/FtsRecord.scala
+++ b/modules/fts-psql/src/main/scala/docspell/ftspsql/FtsRecord.scala
@@ -1,6 +1,13 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.ftspsql
 
 import cats.syntax.all._
+
 import docspell.common.{Ident, Language}
 import docspell.ftsclient.TextData
 
diff --git a/modules/fts-psql/src/main/scala/docspell/ftspsql/FtsRepository.scala b/modules/fts-psql/src/main/scala/docspell/ftspsql/FtsRepository.scala
index 38515ea8..ff32acbf 100644
--- a/modules/fts-psql/src/main/scala/docspell/ftspsql/FtsRepository.scala
+++ b/modules/fts-psql/src/main/scala/docspell/ftspsql/FtsRepository.scala
@@ -1,11 +1,19 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.ftspsql
 
 import cats.data.NonEmptyList
+import fs2.Chunk
+
 import docspell.common._
 import docspell.ftsclient.FtsQuery
+
 import doobie._
 import doobie.implicits._
-import fs2.Chunk
 
 object FtsRepository extends DoobieMeta {
   val table = fr"ftspsql_search"
diff --git a/modules/fts-psql/src/main/scala/docspell/ftspsql/PgQueryParser.scala b/modules/fts-psql/src/main/scala/docspell/ftspsql/PgQueryParser.scala
index f189a0aa..01f7607e 100644
--- a/modules/fts-psql/src/main/scala/docspell/ftspsql/PgQueryParser.scala
+++ b/modules/fts-psql/src/main/scala/docspell/ftspsql/PgQueryParser.scala
@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.ftspsql
 
 import cats.data.NonEmptyList
diff --git a/modules/fts-psql/src/main/scala/docspell/ftspsql/PsqlConfig.scala b/modules/fts-psql/src/main/scala/docspell/ftspsql/PsqlConfig.scala
index 41a10af7..a6dbe6bd 100644
--- a/modules/fts-psql/src/main/scala/docspell/ftspsql/PsqlConfig.scala
+++ b/modules/fts-psql/src/main/scala/docspell/ftspsql/PsqlConfig.scala
@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.ftspsql
 
 import docspell.common._
diff --git a/modules/fts-psql/src/main/scala/docspell/ftspsql/PsqlFtsClient.scala b/modules/fts-psql/src/main/scala/docspell/ftspsql/PsqlFtsClient.scala
index b8156114..fefa3e55 100644
--- a/modules/fts-psql/src/main/scala/docspell/ftspsql/PsqlFtsClient.scala
+++ b/modules/fts-psql/src/main/scala/docspell/ftspsql/PsqlFtsClient.scala
@@ -1,17 +1,25 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.ftspsql
 
+import scala.concurrent.ExecutionContext
+
 import cats.effect._
 import cats.implicits._
-import com.zaxxer.hikari.HikariDataSource
+import fs2.Stream
+
 import docspell.common._
 import docspell.ftsclient._
 import docspell.logging.Logger
+
+import com.zaxxer.hikari.HikariDataSource
 import doobie._
 import doobie.hikari.HikariTransactor
 import doobie.implicits._
-import fs2.Stream
-
-import scala.concurrent.ExecutionContext
 
 final class PsqlFtsClient[F[_]: Sync](cfg: PsqlConfig, xa: Transactor[F])
     extends FtsClient[F] {
diff --git a/modules/fts-psql/src/main/scala/docspell/ftspsql/RankNormalization.scala b/modules/fts-psql/src/main/scala/docspell/ftspsql/RankNormalization.scala
index cc923a96..c6b3eeb9 100644
--- a/modules/fts-psql/src/main/scala/docspell/ftspsql/RankNormalization.scala
+++ b/modules/fts-psql/src/main/scala/docspell/ftspsql/RankNormalization.scala
@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.ftspsql
 
 import cats.Order
diff --git a/modules/fts-psql/src/main/scala/docspell/ftspsql/SearchResult.scala b/modules/fts-psql/src/main/scala/docspell/ftspsql/SearchResult.scala
index 8d2fdab6..faf37fe7 100644
--- a/modules/fts-psql/src/main/scala/docspell/ftspsql/SearchResult.scala
+++ b/modules/fts-psql/src/main/scala/docspell/ftspsql/SearchResult.scala
@@ -1,8 +1,14 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.ftspsql
 
 import docspell.common._
-import docspell.ftsclient.FtsResult.{ItemMatch, MatchData}
 import docspell.ftsclient.FtsResult
+import docspell.ftsclient.FtsResult.{ItemMatch, MatchData}
 
 final case class SearchResult(
     id: Ident,
diff --git a/modules/fts-psql/src/main/scala/docspell/ftspsql/SearchSummary.scala b/modules/fts-psql/src/main/scala/docspell/ftspsql/SearchSummary.scala
index 3e4e838c..e218f698 100644
--- a/modules/fts-psql/src/main/scala/docspell/ftspsql/SearchSummary.scala
+++ b/modules/fts-psql/src/main/scala/docspell/ftspsql/SearchSummary.scala
@@ -1,3 +1,9 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.ftspsql
 
 case class SearchSummary(count: Long, maxScore: Double)
diff --git a/modules/fts-psql/src/test/scala/docspell/ftspsql/MigrationTest.scala b/modules/fts-psql/src/test/scala/docspell/ftspsql/MigrationTest.scala
index 62f1f4f9..2335cf85 100644
--- a/modules/fts-psql/src/test/scala/docspell/ftspsql/MigrationTest.scala
+++ b/modules/fts-psql/src/test/scala/docspell/ftspsql/MigrationTest.scala
@@ -1,14 +1,22 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.ftspsql
 
 import cats.effect._
-import docspell.logging.{Level, LogConfig}
-import munit.CatsEffectSuite
-import com.dimafeng.testcontainers.PostgreSQLContainer
-import com.dimafeng.testcontainers.munit.TestContainerForAll
+
 import docspell.common._
 import docspell.logging.TestLoggingConfig
-import org.testcontainers.utility.DockerImageName
+import docspell.logging.{Level, LogConfig}
+
+import com.dimafeng.testcontainers.PostgreSQLContainer
+import com.dimafeng.testcontainers.munit.TestContainerForAll
 import doobie.implicits._
+import munit.CatsEffectSuite
+import org.testcontainers.utility.DockerImageName
 
 class MigrationTest
     extends CatsEffectSuite
diff --git a/modules/fts-psql/src/test/scala/docspell/ftspsql/PgFixtures.scala b/modules/fts-psql/src/test/scala/docspell/ftspsql/PgFixtures.scala
index 82e15e26..acbbe9e1 100644
--- a/modules/fts-psql/src/test/scala/docspell/ftspsql/PgFixtures.scala
+++ b/modules/fts-psql/src/test/scala/docspell/ftspsql/PgFixtures.scala
@@ -1,15 +1,23 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.ftspsql
 
+import javax.sql.DataSource
+
+import cats.effect._
 import cats.syntax.all._
-import com.dimafeng.testcontainers.PostgreSQLContainer
+
 import docspell.common._
+import docspell.ftsclient.TextData
 import docspell.store.{JdbcConfig, StoreFixture}
+
+import com.dimafeng.testcontainers.PostgreSQLContainer
 import doobie._
 import doobie.implicits._
-import cats.effect._
-import docspell.ftsclient.TextData
-
-import javax.sql.DataSource
 
 trait PgFixtures {
   def ident(n: String): Ident = Ident.unsafe(n)
diff --git a/modules/fts-psql/src/test/scala/docspell/ftspsql/PsqlFtsClientTest.scala b/modules/fts-psql/src/test/scala/docspell/ftspsql/PsqlFtsClientTest.scala
index eb611315..b5c099f3 100644
--- a/modules/fts-psql/src/test/scala/docspell/ftspsql/PsqlFtsClientTest.scala
+++ b/modules/fts-psql/src/test/scala/docspell/ftspsql/PsqlFtsClientTest.scala
@@ -1,14 +1,22 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.ftspsql
 
+import cats.effect._
 import cats.syntax.all._
+
+import docspell.ftsclient.{FtsQuery, TextData}
+import docspell.logging.{Level, LogConfig, TestLoggingConfig}
+
 import com.dimafeng.testcontainers.PostgreSQLContainer
 import com.dimafeng.testcontainers.munit.TestContainerForAll
-import docspell.logging.{Level, LogConfig, TestLoggingConfig}
+import doobie.implicits._
 import munit.CatsEffectSuite
 import org.testcontainers.utility.DockerImageName
-import cats.effect._
-import docspell.ftsclient.{FtsQuery, TextData}
-import doobie.implicits._
 
 class PsqlFtsClientTest
     extends CatsEffectSuite
diff --git a/modules/joex/src/main/scala/docspell/joex/JoexTasks.scala b/modules/joex/src/main/scala/docspell/joex/JoexTasks.scala
index 59e0ff69..303e0e55 100644
--- a/modules/joex/src/main/scala/docspell/joex/JoexTasks.scala
+++ b/modules/joex/src/main/scala/docspell/joex/JoexTasks.scala
@@ -7,13 +7,13 @@
 package docspell.joex
 
 import cats.effect.{Async, Resource}
+
 import docspell.analysis.TextAnalyser
 import docspell.backend.fulltext.CreateIndex
 import docspell.backend.ops._
 import docspell.common._
 import docspell.ftsclient.FtsClient
 import docspell.ftspsql.{PsqlConfig, PsqlFtsClient}
-//import docspell.ftssolr.SolrFtsClient
 import docspell.joex.analysis.RegexNerFile
 import docspell.joex.emptytrash.EmptyTrashTask
 import docspell.joex.filecopy.{FileCopyTask, FileIntegrityCheckTask}
@@ -33,6 +33,7 @@ import docspell.pubsub.api.PubSubT
 import docspell.scheduler.impl.JobStoreModuleBuilder
 import docspell.scheduler.{JobStoreModule, JobTask, JobTaskRegistry}
 import docspell.store.Store
+
 import emil.Emil
 import org.http4s.client.Client
 
diff --git a/modules/restserver/src/main/scala/docspell/restserver/RestAppImpl.scala b/modules/restserver/src/main/scala/docspell/restserver/RestAppImpl.scala
index c19916cb..484a3e23 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/RestAppImpl.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/RestAppImpl.scala
@@ -9,12 +9,12 @@ package docspell.restserver
 import cats.effect._
 import fs2.Stream
 import fs2.concurrent.Topic
+
 import docspell.backend.BackendApp
 import docspell.backend.auth.{AuthToken, ShareToken}
 import docspell.common.Password
 import docspell.ftsclient.FtsClient
 import docspell.ftspsql.{PsqlConfig, PsqlFtsClient}
-//import docspell.ftssolr.SolrFtsClient
 import docspell.notification.api.NotificationModule
 import docspell.notification.impl.NotificationModuleImpl
 import docspell.oidc.CodeFlowRoutes
@@ -26,6 +26,7 @@ import docspell.restserver.webapp.{TemplateRoutes, Templates, WebjarRoutes}
 import docspell.restserver.ws.{OutputEvent, WebSocketRoutes}
 import docspell.scheduler.impl.JobStoreModuleBuilder
 import docspell.store.Store
+
 import emil.javamail.JavaMailEmil
 import org.http4s.HttpRoutes
 import org.http4s.client.Client