diff --git a/build.sbt b/build.sbt
index caf32944..1fde9e7d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -149,7 +149,7 @@ lazy val httpUtils = crossProject(JSPlatform, JVMPlatform) // project
   )
 
 lazy val mediator = project
-  .in(file("did-mediator"))
+  .in(file("mediator"))
   .settings(publish / skip := true)
   .settings((setupTestConfig): _*)
   .settings(
@@ -165,7 +165,7 @@ lazy val mediator = project
     libraryDependencies += D.mongo.value,
   )
   .settings(
-    Compile / mainClass := Some("fmgp.did.demo.MediatorStandalone"),
+    Compile / mainClass := Some("io.iohk.atala.mediator.app.MediatorStandalone"),
     Docker / maintainer := "atala-coredid@iohk.io",
     Docker / dockerUsername := Some("input-output-hk"),
     Docker / dockerRepository := Some("ghcr.io"),
diff --git a/did-mediator/src/main/scala/fmgp/did/MongoDriver.scala b/did-mediator/src/main/scala/fmgp/did/MongoDriver.scala
deleted file mode 100644
index f967bd12..00000000
--- a/did-mediator/src/main/scala/fmgp/did/MongoDriver.scala
+++ /dev/null
@@ -1,59 +0,0 @@
-package fmgp.did
-
-import scala.concurrent.{ExecutionContext, Future}
-
-import reactivemongo.api.{Cursor, DB, MongoConnection, AsyncDriver}
-import reactivemongo.api.bson.{BSONDocumentWriter, BSONDocumentReader, Macros, document}
-
-object MongoDriver {
-  // My settings (see available connection options)
-  // val connectionString = "mongodb://localhost:27017/mydb?authMode=scram-sha1"
-  val connectionString =
-    // "mongodb+srv://mediator:@fmgp-db.orfjsdi.mongodb.net/?retryWrites=true&w=majority"
-    "mongodb+srv://mediator:w419cDYIQ2lxpDKT@mediatordb.sa0rfqg.mongodb.net"
-
-  import ExecutionContext.Implicits.global // use any appropriate context
-
-  // Connect to the database: Must be done only once per application
-  val driver = AsyncDriver()
-  val parsedUri = MongoConnection.fromString(connectionString)
-
-  // Database and collections: Get references
-  val futureConnection = parsedUri.flatMap(driver.connect(_))
-  def db1: Future[DB] = futureConnection.flatMap(_.database("firstdb"))
-  def db2: Future[DB] = futureConnection.flatMap(_.database("anotherdb"))
-  def personCollection = db1.map(_.collection("person"))
-
-  // Write Documents: insert or update
-
-  implicit def personWriter: BSONDocumentWriter[Person] = Macros.writer[Person]
-  // or provide a custom one
-
-  // use personWriter
-  def createPerson(person: Person): Future[Unit] =
-    personCollection.flatMap(_.insert.one(person).map(_ => {}))
-
-  def updatePerson(person: Person): Future[Int] = {
-    val selector = document(
-      "firstName" -> person.firstName,
-      "lastName" -> person.lastName
-    )
-
-    // Update the matching person
-    personCollection.flatMap(_.update.one(selector, person).map(_.n))
-  }
-
-  implicit def personReader: BSONDocumentReader[Person] = Macros.reader[Person]
-  // or provide a custom one
-
-  def findPersonByAge(age: Int): Future[List[Person]] =
-    personCollection.flatMap(
-      _.find(document("age" -> age))
-        .cursor[Person]()
-        .collect[List](-1, Cursor.FailOnError[List[Person]]())
-    )
-    // ... deserializes the document using personReader
-
-  // Custom persistent types
-  case class Person(firstName: String, lastName: String, age: Int)
-}
diff --git a/http-utils/jvm/src/main/scala/fmgp/did/comm/MessageDispatcherJVM.scala b/http-utils/jvm/src/main/scala/io/iohk/atala/mediator/comm/MessageDispatcherJVM.scala
similarity index 83%
rename from http-utils/jvm/src/main/scala/fmgp/did/comm/MessageDispatcherJVM.scala
rename to http-utils/jvm/src/main/scala/io/iohk/atala/mediator/comm/MessageDispatcherJVM.scala
index 076462b7..4401ca10 100644
--- a/http-utils/jvm/src/main/scala/fmgp/did/comm/MessageDispatcherJVM.scala
+++ b/http-utils/jvm/src/main/scala/io/iohk/atala/mediator/comm/MessageDispatcherJVM.scala
@@ -1,14 +1,14 @@
-package fmgp.did.comm
+package io.iohk.atala.mediator.comm
 
-import zio._
-import zio.json._
-import zio.http._
-import zio.http.model._
-
-import fmgp.did._
-import fmgp.did.comm._
-import fmgp.crypto.error._
-import fmgp.util.MyHeaders
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import io.iohk.atala.mediator.comm.*
+import io.iohk.atala.mediator.utils.MyHeaders
+import zio.*
+import zio.http.*
+import zio.http.model.*
+import zio.json.*
 
 object MessageDispatcherJVM {
   val layer: ZLayer[Client, Throwable, MessageDispatcher] =
diff --git a/http-utils/jvm/src/main/scala/fmgp/util/DIDSocketManager.scala b/http-utils/jvm/src/main/scala/io/iohk/atala/mediator/utils/DIDSocketManager.scala
similarity index 95%
rename from http-utils/jvm/src/main/scala/fmgp/util/DIDSocketManager.scala
rename to http-utils/jvm/src/main/scala/io/iohk/atala/mediator/utils/DIDSocketManager.scala
index 69cd3cf1..c909b82b 100644
--- a/http-utils/jvm/src/main/scala/fmgp/util/DIDSocketManager.scala
+++ b/http-utils/jvm/src/main/scala/io/iohk/atala/mediator/utils/DIDSocketManager.scala
@@ -1,14 +1,13 @@
-package fmgp.util
+package io.iohk.atala.mediator.utils
 
-import zio._
-import zio.json._
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import zio.*
+import zio.http.socket.*
 import zio.http.{Channel, ChannelEvent}
-import zio.http.socket._
-import zio.stream._
-
-import fmgp.did._
-import fmgp.did.comm._
-import fmgp.crypto.error._
+import zio.json.*
+import zio.stream.*
 
 case class DIDSocketManager(
     sockets: Map[SocketID, MyChannel] = Map.empty,
diff --git a/http-utils/jvm/src/main/scala/fmgp/util/HttpHelpers.scala b/http-utils/jvm/src/main/scala/io/iohk/atala/mediator/utils/HttpHelpers.scala
similarity index 94%
rename from http-utils/jvm/src/main/scala/fmgp/util/HttpHelpers.scala
rename to http-utils/jvm/src/main/scala/io/iohk/atala/mediator/utils/HttpHelpers.scala
index d59a2f20..2f19d8e8 100644
--- a/http-utils/jvm/src/main/scala/fmgp/util/HttpHelpers.scala
+++ b/http-utils/jvm/src/main/scala/io/iohk/atala/mediator/utils/HttpHelpers.scala
@@ -1,7 +1,7 @@
-package fmgp.util
+package io.iohk.atala.mediator.utils
 
-import zio._
-import zio.http._
+import zio.*
+import zio.http.*
 
 extension [R, Err](app: HttpApp[R, Err])
   def annotateLogs: HttpApp[R, Err] =
diff --git a/http-utils/jvm/src/main/scala/fmgp/util/MyChannel.scala b/http-utils/jvm/src/main/scala/io/iohk/atala/mediator/utils/MyChannel.scala
similarity index 63%
rename from http-utils/jvm/src/main/scala/fmgp/util/MyChannel.scala
rename to http-utils/jvm/src/main/scala/io/iohk/atala/mediator/utils/MyChannel.scala
index 1f4557ad..be873a8a 100644
--- a/http-utils/jvm/src/main/scala/fmgp/util/MyChannel.scala
+++ b/http-utils/jvm/src/main/scala/io/iohk/atala/mediator/utils/MyChannel.scala
@@ -1,6 +1,6 @@
-package fmgp.util
+package io.iohk.atala.mediator.utils
 
-import zio._
+import zio.*
 
 type SocketID = String
 case class MyChannel(id: SocketID, socketOutHub: Hub[String])
diff --git a/http-utils/shared/src/main/scala/fmgp/did/comm/MessageDispatcher.scala b/http-utils/shared/src/main/scala/io/iohk/atala/mediator/comm/MessageDispatcher.scala
similarity index 50%
rename from http-utils/shared/src/main/scala/fmgp/did/comm/MessageDispatcher.scala
rename to http-utils/shared/src/main/scala/io/iohk/atala/mediator/comm/MessageDispatcher.scala
index dcf288cf..a9926a7f 100644
--- a/http-utils/shared/src/main/scala/fmgp/did/comm/MessageDispatcher.scala
+++ b/http-utils/shared/src/main/scala/io/iohk/atala/mediator/comm/MessageDispatcher.scala
@@ -1,12 +1,11 @@
-package fmgp.did.comm
+package io.iohk.atala.mediator.comm
 
-import zio._
-import zio.json._
-
-import fmgp.did._
-import fmgp.did.comm._
-import fmgp.crypto.error._
-import fmgp.util.MyHeaders
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import io.iohk.atala.mediator.utils.MyHeaders
+import zio.*
+import zio.json.*
 
 trait MessageDispatcher {
   def send(
diff --git a/http-utils/shared/src/main/scala/fmgp/did/comm/TapMessage.scala b/http-utils/shared/src/main/scala/io/iohk/atala/mediator/comm/TapMessage.scala
similarity index 77%
rename from http-utils/shared/src/main/scala/fmgp/did/comm/TapMessage.scala
rename to http-utils/shared/src/main/scala/io/iohk/atala/mediator/comm/TapMessage.scala
index 2242c0c5..4e7a686f 100644
--- a/http-utils/shared/src/main/scala/fmgp/did/comm/TapMessage.scala
+++ b/http-utils/shared/src/main/scala/io/iohk/atala/mediator/comm/TapMessage.scala
@@ -1,7 +1,7 @@
-package fmgp.did.comm
-
-import zio.json._
+package io.iohk.atala.mediator.comm
 
+import zio.json.*
+import fmgp.did.comm.*
 final case class TapMessage(msg: EncryptedMessage, decrypted: PlaintextMessage)
 
 object TapMessage {
diff --git a/http-utils/shared/src/main/scala/fmgp/util/MyHeaders.scala b/http-utils/shared/src/main/scala/io/iohk/atala/mediator/utils/MyHeaders.scala
similarity index 69%
rename from http-utils/shared/src/main/scala/fmgp/util/MyHeaders.scala
rename to http-utils/shared/src/main/scala/io/iohk/atala/mediator/utils/MyHeaders.scala
index 6eb1fa6a..9558755c 100644
--- a/http-utils/shared/src/main/scala/fmgp/util/MyHeaders.scala
+++ b/http-utils/shared/src/main/scala/io/iohk/atala/mediator/utils/MyHeaders.scala
@@ -1,4 +1,4 @@
-package fmgp.util
+package io.iohk.atala.mediator.utils
 
 object MyHeaders {
   final val xForwardedHost: CharSequence = "x-forwarded-host"
diff --git a/did-mediator/src/main/resources/application.conf b/mediator/src/main/resources/application.conf
similarity index 100%
rename from did-mediator/src/main/resources/application.conf
rename to mediator/src/main/resources/application.conf
diff --git a/did-mediator/src/main/scala/fmgp/did/Error.scala b/mediator/src/main/scala/io/iohk/atala/mediator/Error.scala
similarity index 92%
rename from did-mediator/src/main/scala/fmgp/did/Error.scala
rename to mediator/src/main/scala/io/iohk/atala/mediator/Error.scala
index 6a225790..efcc0cd6 100644
--- a/did-mediator/src/main/scala/fmgp/did/Error.scala
+++ b/mediator/src/main/scala/io/iohk/atala/mediator/Error.scala
@@ -1,9 +1,9 @@
-package fmgp.did
+package io.iohk.atala.mediator
 
-import fmgp.crypto.error._
-import fmgp.did._
-import fmgp.did.comm._
-import zio.json._
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import zio.json.*
 
 trait MediatorError
 
diff --git a/did-mediator/src/main/scala/fmgp/did/comm/protocol/Action.scala b/mediator/src/main/scala/io/iohk/atala/mediator/actions/Action.scala
similarity index 93%
rename from did-mediator/src/main/scala/fmgp/did/comm/protocol/Action.scala
rename to mediator/src/main/scala/io/iohk/atala/mediator/actions/Action.scala
index aa32ad6a..32bb5846 100644
--- a/did-mediator/src/main/scala/fmgp/did/comm/protocol/Action.scala
+++ b/mediator/src/main/scala/io/iohk/atala/mediator/actions/Action.scala
@@ -1,4 +1,4 @@
-package fmgp.did.comm.protocol
+package io.iohk.atala.mediator.actions
 
 import fmgp.did.comm.PlaintextMessage
 
diff --git a/did-mediator/src/main/scala/fmgp/did/comm/protocol/ProtocolExecute.scala b/mediator/src/main/scala/io/iohk/atala/mediator/actions/ProtocolExecute.scala
similarity index 94%
rename from did-mediator/src/main/scala/fmgp/did/comm/protocol/ProtocolExecute.scala
rename to mediator/src/main/scala/io/iohk/atala/mediator/actions/ProtocolExecute.scala
index eb4976ac..824a91af 100644
--- a/did-mediator/src/main/scala/fmgp/did/comm/protocol/ProtocolExecute.scala
+++ b/mediator/src/main/scala/io/iohk/atala/mediator/actions/ProtocolExecute.scala
@@ -1,17 +1,17 @@
-package fmgp.did.comm.protocol
-
-import zio._
-import zio.json._
-
-import fmgp.crypto.error._
-import fmgp.did._
-import fmgp.did.comm._
-import fmgp.did.comm.Operations._
-import fmgp.did.comm.protocol._
-import fmgp.did.comm.protocol.basicmessage2._
-import fmgp.did.comm.protocol.trustping2._
-import fmgp.did.db._
-
+package io.iohk.atala.mediator.actions
+
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import fmgp.did.comm.Operations.*
+import fmgp.did.comm.protocol.*
+import fmgp.did.comm.protocol.basicmessage2.*
+import fmgp.did.comm.protocol.trustping2.*
+import io.iohk.atala.mediator.*
+import io.iohk.atala.mediator.comm.*
+import io.iohk.atala.mediator.db.*
+import zio.*
+import zio.json.*
 //TODO pick a better name // maybe "Protocol" only
 
 trait ProtocolExecuter[-R] {
diff --git a/did-mediator/src/main/scala/fmgp/did/comm/mediator/MediatorAgent.scala b/mediator/src/main/scala/io/iohk/atala/mediator/app/MediatorAgent.scala
similarity index 95%
rename from did-mediator/src/main/scala/fmgp/did/comm/mediator/MediatorAgent.scala
rename to mediator/src/main/scala/io/iohk/atala/mediator/app/MediatorAgent.scala
index 26c6fae6..0f0f53a4 100644
--- a/did-mediator/src/main/scala/fmgp/did/comm/mediator/MediatorAgent.scala
+++ b/mediator/src/main/scala/io/iohk/atala/mediator/app/MediatorAgent.scala
@@ -1,27 +1,27 @@
-package fmgp.did.comm.mediator
-
-import zio._
-import zio.json._
-import zio.http._
-import zio.http.model._
-import zio.http.socket._
-import zio.http.socket.SocketApp
+package io.iohk.atala.mediator.app
 
+import fmgp.crypto.*
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import fmgp.did.comm.protocol.*
+import io.iohk.atala.mediator.*
+import io.iohk.atala.mediator.actions.*
+import io.iohk.atala.mediator.comm.*
+import io.iohk.atala.mediator.db.*
+import io.iohk.atala.mediator.protocols.*
+import io.iohk.atala.mediator.utils.*
 import io.netty.handler.codec.http.HttpHeaderNames
+import reactivemongo.api.bson.Macros.{*, given}
+import reactivemongo.api.bson.{*, given}
+import zio.*
+import zio.http.*
+import zio.http.model.*
+import zio.http.socket.*
+import zio.json.*
 
-import fmgp.util._
-import fmgp.did._
-import fmgp.crypto._
-import fmgp.crypto.error._
-import fmgp.did.comm._
-import fmgp.did.comm.protocol._
-import fmgp.did.db._
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.util.Try
-
-import reactivemongo.api.bson.{_, given}
-import reactivemongo.api.bson.Macros.{_, given}
-
 case class MediatorAgent(
     override val id: DID,
     override val keyStore: KeyStore, // Should we make it lazy with ZIO
diff --git a/did-mediator/src/main/scala/fmgp/did/comm/mediator/MediatorStandalone.scala b/mediator/src/main/scala/io/iohk/atala/mediator/app/MediatorStandalone.scala
similarity index 88%
rename from did-mediator/src/main/scala/fmgp/did/comm/mediator/MediatorStandalone.scala
rename to mediator/src/main/scala/io/iohk/atala/mediator/app/MediatorStandalone.scala
index a223048b..00488a1d 100644
--- a/did-mediator/src/main/scala/fmgp/did/comm/mediator/MediatorStandalone.scala
+++ b/mediator/src/main/scala/io/iohk/atala/mediator/app/MediatorStandalone.scala
@@ -1,30 +1,29 @@
-package fmgp.did.demo
+package io.iohk.atala.mediator.app
 
-import zio._
-import zio.json._
-import zio.stream._
-import zio.http._
-import zio.http.model._
-import zio.http.socket._
+import fmgp.crypto.*
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import fmgp.did.comm.protocol.*
+import fmgp.did.method.peer.*
+import io.iohk.atala.mediator.actions.*
+import io.iohk.atala.mediator.comm.*
+import io.iohk.atala.mediator.db.*
+import io.iohk.atala.mediator.protocols.*
+import io.iohk.atala.mediator.utils.*
+import zio.*
+import zio.config.*
+import zio.config.magnolia.*
+import zio.config.typesafe.*
+import zio.http.*
+import zio.http.Http.{Empty, Static}
 import zio.http.ZClient.ClientLive
-import zio.http.Http.Empty
-import zio.http.Http.Static
-import zio.config._
-import zio.config.magnolia._
-import zio.config.typesafe._
+import zio.http.model.*
+import zio.http.socket.*
+import zio.json.*
+import zio.stream.*
 
 import scala.io.Source
-
-import fmgp.crypto._
-import fmgp.crypto.error._
-import fmgp.util._
-import fmgp.did._
-import fmgp.did.comm._
-import fmgp.did.comm.mediator._
-import fmgp.did.comm.protocol._
-import fmgp.did.method.peer._
-import fmgp.did.db._
-
 case class MediatorConfig(endpoint: java.net.URI, keyAgreement: OKPPrivateKey, keyAuthentication: OKPPrivateKey) {
   val did = DIDPeer2.makeAgent(
     Seq(keyAgreement, keyAuthentication),
diff --git a/did-mediator/src/main/scala/fmgp/did/db/AsyncDriverResource.scala b/mediator/src/main/scala/io/iohk/atala/mediator/db/AsyncDriverResource.scala
similarity index 84%
rename from did-mediator/src/main/scala/fmgp/did/db/AsyncDriverResource.scala
rename to mediator/src/main/scala/io/iohk/atala/mediator/db/AsyncDriverResource.scala
index 4a805bda..c0f1f33f 100644
--- a/did-mediator/src/main/scala/fmgp/did/db/AsyncDriverResource.scala
+++ b/mediator/src/main/scala/io/iohk/atala/mediator/db/AsyncDriverResource.scala
@@ -1,10 +1,10 @@
-package fmgp.did.db
+package io.iohk.atala.mediator.db
 
-import zio.{TaskLayer, ZIO, ZLayer}
-import scala.concurrent.duration.DurationInt
 import reactivemongo.api.{AsyncDriver, DB, MongoConnection}
-import zio.{Task, ZIO, ZLayer}
+import zio.{Task, TaskLayer, ZIO, ZLayer}
+
 import scala.concurrent.ExecutionContext
+import scala.concurrent.duration.DurationInt
 
 object AsyncDriverResource {
   private def acquire = ZIO.attempt(AsyncDriver())
diff --git a/did-mediator/src/main/scala/fmgp/did/db/BsonImplicits.scala b/mediator/src/main/scala/io/iohk/atala/mediator/db/BsonImplicits.scala
similarity index 95%
rename from did-mediator/src/main/scala/fmgp/did/db/BsonImplicits.scala
rename to mediator/src/main/scala/io/iohk/atala/mediator/db/BsonImplicits.scala
index 0be73f1a..dae90cb1 100644
--- a/did-mediator/src/main/scala/fmgp/did/db/BsonImplicits.scala
+++ b/mediator/src/main/scala/io/iohk/atala/mediator/db/BsonImplicits.scala
@@ -1,16 +1,16 @@
-package fmgp.did.db
+package io.iohk.atala.mediator.db
 
-import scala.util._
-import zio.json._
-import reactivemongo.api.bson._
+import fmgp.crypto.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import fmgp.util.*
+import reactivemongo.api.bson.*
+import zio.json.*
 
-import fmgp.crypto._
-import fmgp.did._
-import fmgp.did.comm._
-import fmgp.util._
+import scala.util.*
 
 given BSONWriter[DIDSubject] with {
-  import DIDSubject._
+  import DIDSubject.*
   def writeTry(obj: DIDSubject): Try[BSONValue] = Try(BSONString(obj.string))
 }
 
@@ -19,7 +19,7 @@ given BSONReader[DIDSubject] with {
 }
 
 given BSONWriter[DID] with {
-  import DID._
+  import DID.*
   def writeTry(obj: DID): Try[BSONValue] = Try(BSONString(obj.string))
 }
 
@@ -28,7 +28,7 @@ given BSONReader[DID] with {
 }
 
 given BSONWriter[APV] with {
-  import APV._
+  import APV.*
   def writeTry(obj: APV): Try[BSONValue] = Try(BSONString(obj.value))
 }
 given BSONReader[APV] with {
@@ -36,7 +36,7 @@ given BSONReader[APV] with {
 }
 
 given BSONWriter[APU] with {
-  import APU._
+  import APU.*
   def writeTry(obj: APU): Try[BSONValue] = Try(BSONString(obj.value))
 }
 given BSONReader[APU] with {
@@ -44,7 +44,7 @@ given BSONReader[APU] with {
 }
 
 given BSONWriter[CipherText] with {
-  import CipherText._
+  import CipherText.*
   def writeTry(obj: CipherText): Try[BSONValue] = Try(BSONString(obj.value))
 }
 
@@ -53,14 +53,14 @@ given BSONReader[CipherText] with {
 }
 
 given BSONWriter[TAG] with {
-  import TAG._
+  import TAG.*
   def writeTry(obj: TAG): Try[BSONValue] = Try(BSONString(obj.value))
 }
 given BSONReader[TAG] with {
   def readTry(bson: BSONValue): Try[TAG] = bson.asTry[String].map(v => TAG(v))
 }
 given BSONWriter[IV] with {
-  import IV._
+  import IV.*
   def writeTry(obj: IV): Try[BSONValue] = Try(BSONString(obj.value))
 }
 given BSONReader[IV] with {
@@ -68,7 +68,7 @@ given BSONReader[IV] with {
 }
 
 given BSONWriter[Base64Obj[ProtectedHeader]] with {
-  import Base64Obj._
+  import Base64Obj.*
   def writeTry(obj: Base64Obj[ProtectedHeader]): Try[BSONValue] = Try(BSONString(obj.base64url))
 }
 given BSONReader[Base64Obj[ProtectedHeader]] with {
@@ -83,12 +83,12 @@ given BSONReader[Base64Obj[ProtectedHeader]] with {
 }
 
 given BSONWriter[Base64] with {
-  import Base64._
+  import Base64.*
   def writeTry(obj: Base64): Try[BSONValue] = Try(BSONString(obj.urlBase64))
 }
 
 given BSONReader[Base64] with {
-  import Base64._
+  import Base64.*
   def readTry(bson: BSONValue): Try[Base64] = bson.asTry[String].map(v => Base64.fromBase64url(v))
 }
 
diff --git a/did-mediator/src/main/scala/fmgp/did/db/DataModels.scala b/mediator/src/main/scala/io/iohk/atala/mediator/db/DataModels.scala
similarity index 91%
rename from did-mediator/src/main/scala/fmgp/did/db/DataModels.scala
rename to mediator/src/main/scala/io/iohk/atala/mediator/db/DataModels.scala
index 675e10fe..f7b43938 100644
--- a/did-mediator/src/main/scala/fmgp/did/db/DataModels.scala
+++ b/mediator/src/main/scala/io/iohk/atala/mediator/db/DataModels.scala
@@ -1,8 +1,9 @@
-package fmgp.did.db
+package io.iohk.atala.mediator.db
+
+import fmgp.did.*
+import fmgp.did.comm.*
+import reactivemongo.api.bson.*
 
-import fmgp.did._
-import fmgp.did.comm._
-import reactivemongo.api.bson._
 import java.time.Instant
 type HASH = Int
 // messages
diff --git a/did-mediator/src/main/scala/fmgp/did/db/DidAccountRepo.scala b/mediator/src/main/scala/io/iohk/atala/mediator/db/DidAccountRepo.scala
similarity index 94%
rename from did-mediator/src/main/scala/fmgp/did/db/DidAccountRepo.scala
rename to mediator/src/main/scala/io/iohk/atala/mediator/db/DidAccountRepo.scala
index eae25a8d..1e40ca27 100644
--- a/did-mediator/src/main/scala/fmgp/did/db/DidAccountRepo.scala
+++ b/mediator/src/main/scala/io/iohk/atala/mediator/db/DidAccountRepo.scala
@@ -1,14 +1,15 @@
-package fmgp.did.db
+package io.iohk.atala.mediator.db
 
-import reactivemongo.api.bson._
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import io.iohk.atala.mediator.*
+import reactivemongo.api.bson.*
 import reactivemongo.api.bson.collection.BSONCollection
 import reactivemongo.api.commands.WriteResult
-import reactivemongo.api.Cursor
-import reactivemongo.api.CursorProducer
-import zio._
-import fmgp.crypto.error._
-import fmgp.did._
-import fmgp.did.comm._
+import reactivemongo.api.{Cursor, CursorProducer}
+import zio.*
+
 import scala.concurrent.ExecutionContext
 
 object DidAccountRepo {
diff --git a/did-mediator/src/main/scala/fmgp/did/db/MessageItemRepo.scala b/mediator/src/main/scala/io/iohk/atala/mediator/db/MessageItemRepo.scala
similarity index 90%
rename from did-mediator/src/main/scala/fmgp/did/db/MessageItemRepo.scala
rename to mediator/src/main/scala/io/iohk/atala/mediator/db/MessageItemRepo.scala
index 4d18d4cf..663a7df2 100644
--- a/did-mediator/src/main/scala/fmgp/did/db/MessageItemRepo.scala
+++ b/mediator/src/main/scala/io/iohk/atala/mediator/db/MessageItemRepo.scala
@@ -1,15 +1,14 @@
-package fmgp.did.db
+package io.iohk.atala.mediator.db
 
-import zio._
-import scala.concurrent.ExecutionContext
-
-import reactivemongo.api.bson._
+import fmgp.did.*
+import io.iohk.atala.mediator.{StorageCollection, StorageError, StorageThrowable}
+import reactivemongo.api.bson.*
 import reactivemongo.api.bson.collection.BSONCollection
 import reactivemongo.api.commands.WriteResult
-import reactivemongo.api.Cursor
-import reactivemongo.api.CursorProducer
+import reactivemongo.api.{Cursor, CursorProducer}
+import zio.*
 
-import fmgp.did._
+import scala.concurrent.ExecutionContext
 object MessageItemRepo {
   def layer: ZLayer[ReactiveMongoApi, Throwable, MessageItemRepo] =
     ZLayer {
diff --git a/did-mediator/src/main/scala/fmgp/did/db/ReactiveMongoApi.scala b/mediator/src/main/scala/io/iohk/atala/mediator/db/ReactiveMongoApi.scala
similarity index 94%
rename from did-mediator/src/main/scala/fmgp/did/db/ReactiveMongoApi.scala
rename to mediator/src/main/scala/io/iohk/atala/mediator/db/ReactiveMongoApi.scala
index 1cd9ed29..13f13de8 100644
--- a/did-mediator/src/main/scala/fmgp/did/db/ReactiveMongoApi.scala
+++ b/mediator/src/main/scala/io/iohk/atala/mediator/db/ReactiveMongoApi.scala
@@ -1,10 +1,10 @@
-package fmgp.did.db
+package io.iohk.atala.mediator.db
 
-import zio.{TaskLayer, ZIO, ZLayer}
-import scala.concurrent.duration.DurationInt
-import reactivemongo.api.{AsyncDriver, DB, MongoConnection}
-import zio.{Task, ZIO, ZLayer}
 import reactivemongo.api.MongoConnection.ParsedURIWithDB
+import reactivemongo.api.{AsyncDriver, DB, MongoConnection}
+import zio.{Task, TaskLayer, ZIO, ZLayer}
+
+import scala.concurrent.duration.DurationInt
 
 trait ReactiveMongoApi {
   def driver: AsyncDriver
diff --git a/did-mediator/src/main/scala/fmgp/did/comm/mediator/ForwardMessageExecuter.scala b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/ForwardMessageExecuter.scala
similarity index 81%
rename from did-mediator/src/main/scala/fmgp/did/comm/mediator/ForwardMessageExecuter.scala
rename to mediator/src/main/scala/io/iohk/atala/mediator/protocols/ForwardMessageExecuter.scala
index 8c9815c3..b6e51e31 100644
--- a/did-mediator/src/main/scala/fmgp/did/comm/mediator/ForwardMessageExecuter.scala
+++ b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/ForwardMessageExecuter.scala
@@ -1,13 +1,15 @@
-package fmgp.did.comm.mediator
+package io.iohk.atala.mediator.protocols
 
-import zio._
-import zio.json._
-import fmgp.crypto.error._
-import fmgp.did._
-import fmgp.did.comm._
-import fmgp.did.comm.protocol._
-import fmgp.did.comm.protocol.routing2._
-import fmgp.did.db._
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import fmgp.did.comm.protocol.*
+import fmgp.did.comm.protocol.routing2.*
+import io.iohk.atala.mediator.MediatorError
+import io.iohk.atala.mediator.actions.*
+import io.iohk.atala.mediator.db.*
+import zio.*
+import zio.json.*
 
 object ForwardMessageExecuter
     extends ProtocolExecuterWithServices[
diff --git a/did-mediator/src/main/scala/fmgp/did/comm/mediator/MediatorCoordinationExecuter.scala b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/MediatorCoordinationExecuter.scala
similarity index 89%
rename from did-mediator/src/main/scala/fmgp/did/comm/mediator/MediatorCoordinationExecuter.scala
rename to mediator/src/main/scala/io/iohk/atala/mediator/protocols/MediatorCoordinationExecuter.scala
index 36f3bae0..774943d9 100644
--- a/did-mediator/src/main/scala/fmgp/did/comm/mediator/MediatorCoordinationExecuter.scala
+++ b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/MediatorCoordinationExecuter.scala
@@ -1,15 +1,16 @@
-package fmgp.did.comm.mediator
-
-import zio._
-import zio.json._
-import fmgp.crypto.error._
-import fmgp.did._
-import fmgp.did.comm._
-import fmgp.did.comm.Operations._
-import fmgp.did.comm.protocol._
-import fmgp.did.comm.protocol.mediatorcoordination2._
-import fmgp.did.db.DidAccountRepo
+package io.iohk.atala.mediator.protocols
 
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import fmgp.did.comm.Operations.*
+import fmgp.did.comm.protocol.*
+import fmgp.did.comm.protocol.mediatorcoordination2.*
+import io.iohk.atala.mediator.*
+import io.iohk.atala.mediator.actions.*
+import io.iohk.atala.mediator.db.DidAccountRepo
+import zio.*
+import zio.json.*
 object MediatorCoordinationExecuter extends ProtocolExecuterWithServices[ProtocolExecuter.Services & DidAccountRepo] {
 
   override def suportedPIURI: Seq[PIURI] = Seq(
diff --git a/did-mediator/src/main/scala/fmgp/did/comm/mediator/PickupExecuter.scala b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/PickupExecuter.scala
similarity index 91%
rename from did-mediator/src/main/scala/fmgp/did/comm/mediator/PickupExecuter.scala
rename to mediator/src/main/scala/io/iohk/atala/mediator/protocols/PickupExecuter.scala
index c8b11b56..6037f4a8 100644
--- a/did-mediator/src/main/scala/fmgp/did/comm/mediator/PickupExecuter.scala
+++ b/mediator/src/main/scala/io/iohk/atala/mediator/protocols/PickupExecuter.scala
@@ -1,15 +1,16 @@
-package fmgp.did.comm.mediator
-
-import zio._
-import zio.json._
-import fmgp.crypto.error._
-import fmgp.did._
-import fmgp.did.comm._
-import fmgp.did.comm.Operations._
-import fmgp.did.comm.protocol._
-import fmgp.did.comm.protocol.pickup3._
-import fmgp.did.db._
+package io.iohk.atala.mediator.protocols
 
+import fmgp.crypto.error.*
+import fmgp.did.*
+import fmgp.did.comm.*
+import fmgp.did.comm.Operations.*
+import fmgp.did.comm.protocol.*
+import fmgp.did.comm.protocol.pickup3.*
+import io.iohk.atala.mediator.*
+import io.iohk.atala.mediator.actions.*
+import io.iohk.atala.mediator.db.*
+import zio.*
+import zio.json.*
 object PickupExecuter
     extends ProtocolExecuterWithServices[ProtocolExecuter.Services & DidAccountRepo & MessageItemRepo] {
 
diff --git a/package.json b/package.json
index 4d744478..c4302bed 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
             [
                 "@semantic-release/exec",
                 {
-                    "prepareCmd": "docker buildx build --platform=linux/arm64,linux/amd64 --push -t ghcr.io/input-output-hk/atala-prism-mediator:${nextRelease.version} ./did-mediator/target/docker/stage"
+                    "prepareCmd": "docker buildx build --platform=linux/arm64,linux/amd64 --push -t ghcr.io/input-output-hk/atala-prism-mediator:${nextRelease.version} ./mediator/target/docker/stage"
                 }
             ],
             [