diff --git a/src/main/scala/tuples/space/client/JsonTupleSpace.scala b/src/main/scala/tuples/space/client/JsonTupleSpace.scala
index 01ea179..1465032 100644
--- a/src/main/scala/tuples/space/client/JsonTupleSpace.scala
+++ b/src/main/scala/tuples/space/client/JsonTupleSpace.scala
@@ -54,10 +54,10 @@ import io.circe.parser.*
 import io.circe.syntax.*
 
 import tuples.space.*
-import tuples.space.request.*
-import tuples.space.request.RequestSerializer.given
-import tuples.space.response.*
-import tuples.space.response.ResponseDeserializer.given
+import tuples.space.client.request.*
+import request.RequestSerializer.given
+import tuples.space.client.response.*
+import response.ResponseDeserializer.given
 import AnyOps.*
 
 /** A coordination medium to be used to exchange pieces of information and coordinate with other entities, implemented to be used
diff --git a/src/main/scala/tuples/space/client/request/Request.scala b/src/main/scala/tuples/space/client/request/Request.scala
index f65cd48..e721af6 100644
--- a/src/main/scala/tuples/space/client/request/Request.scala
+++ b/src/main/scala/tuples/space/client/request/Request.scala
@@ -20,17 +20,14 @@
  */
 
 package io.github.cakelier
-package tuples.space.request
+package tuples.space.client.request
 
-import java.util.UUID
+import tuples.space.*
 
-import io.circe.Decoder
-import io.circe.DecodingFailure
-import io.circe.Encoder
-import io.circe.Json
 import io.circe.syntax.*
+import io.circe.{Decoder, DecodingFailure, Encoder, Json}
 
-import tuples.space.*
+import java.util.UUID
 
 /** A request that a [[io.github.cakelier.tuples.space.client.JsonTupleSpace]] can make to its server.
   *
diff --git a/src/main/scala/tuples/space/client/request/RequestSerializer.scala b/src/main/scala/tuples/space/client/request/RequestSerializer.scala
index 10454d9..fcd593f 100644
--- a/src/main/scala/tuples/space/client/request/RequestSerializer.scala
+++ b/src/main/scala/tuples/space/client/request/RequestSerializer.scala
@@ -20,15 +20,14 @@
  */
 
 package io.github.cakelier
-package tuples.space.request
-
-import io.circe.Encoder
-import io.circe.Json
-import io.circe.syntax.*
+package tuples.space.client.request
 
+import AnyOps.*
 import tuples.space.*
 import tuples.space.JsonSerializable.given
-import AnyOps.*
+
+import io.circe.{Encoder, Json}
+import io.circe.syntax.*
 
 /** This object contains all serializers for the [[Request]] sub-types. */
 private[client] object RequestSerializer {
diff --git a/src/main/scala/tuples/space/client/request/TemplateRequestType.scala b/src/main/scala/tuples/space/client/request/TemplateRequestType.scala
index df5d5db..e4751d8 100644
--- a/src/main/scala/tuples/space/client/request/TemplateRequestType.scala
+++ b/src/main/scala/tuples/space/client/request/TemplateRequestType.scala
@@ -20,7 +20,7 @@
  */
 
 package io.github.cakelier
-package tuples.space.request
+package tuples.space.client.request
 
 /** The enum representing all the different types of operations that can be carried on using a [[TemplateRequest]]. */
 private[client] enum TemplateRequestType {
diff --git a/src/main/scala/tuples/space/client/response/Response.scala b/src/main/scala/tuples/space/client/response/Response.scala
index 2c2d328..780a5a2 100644
--- a/src/main/scala/tuples/space/client/response/Response.scala
+++ b/src/main/scala/tuples/space/client/response/Response.scala
@@ -20,12 +20,12 @@
  */
 
 package io.github.cakelier
-package tuples.space.response
-
-import java.util.UUID
+package tuples.space.client.response
 
 import tuples.space.*
 
+import java.util.UUID
+
 /** A response that a [[io.github.cakelier.tuples.space.client.JsonTupleSpace]] can receive from its server.
   *
   * This trait represents a generic response that a [[io.github.cakelier.tuples.space.client.JsonTupleSpace]] client can receive
@@ -37,10 +37,10 @@ import tuples.space.*
   * client, for example for signalling that the connection has been established with success and a new id is provided to the
   * client or that the client wants to use another id instead.
   */
-private[response] sealed trait Response
+private[client] sealed trait Response
 
 /** Companion object to the [[Response]] trait, containing its implementations. */
-private[response] object Response {
+private[client] object Response {
 
   /** A [[Response]] which associated request has as content a single [[JsonTuple]].
     *
@@ -325,7 +325,7 @@ private[response] object Response {
     * the client will reappear or not. This [[Response]] is sent from the server to confirm just that: the server is telling that
     * a client previously connected has now reconnected and its id is now the one given in the previously sent
     * [[io.github.cakelier.tuples.space.request.Request]]. This way, the client can regain access to the
-    * [[io.github.cakelier.tuples.space.response.Response]]s associated to the [[Request]]s placed before the disconnection.
+    * [[Response]]s associated to the [[Request]]s placed before the disconnection.
     */
   sealed trait MergeSuccessResponse extends Response {
 
diff --git a/src/main/scala/tuples/space/client/response/ResponseDeserializer.scala b/src/main/scala/tuples/space/client/response/ResponseDeserializer.scala
index bfcc324..830bdc2 100644
--- a/src/main/scala/tuples/space/client/response/ResponseDeserializer.scala
+++ b/src/main/scala/tuples/space/client/response/ResponseDeserializer.scala
@@ -20,18 +20,17 @@
  */
 
 package io.github.cakelier
-package tuples.space.response
-
-import io.circe.Decoder
-import io.circe.DecodingFailure
-import io.circe.syntax.*
+package tuples.space.client.response
 
 import AnyOps.*
 import tuples.space.*
 import tuples.space.JsonSerializable.given
 
+import io.circe.{Decoder, DecodingFailure}
+import io.circe.syntax.*
+
 /** This object contains all deserializers for the [[Response]] sub-types. */
-private[space] object ResponseDeserializer {
+private[client] object ResponseDeserializer {
 
   /* The Decoder given instance for the TupleResponse trait. */
   private given Decoder[TupleResponse] = c =>
diff --git a/src/main/scala/tuples/space/client/response/TemplateMaybeTupleResponseType.scala b/src/main/scala/tuples/space/client/response/TemplateMaybeTupleResponseType.scala
index 673559d..de91feb 100644
--- a/src/main/scala/tuples/space/client/response/TemplateMaybeTupleResponseType.scala
+++ b/src/main/scala/tuples/space/client/response/TemplateMaybeTupleResponseType.scala
@@ -20,11 +20,11 @@
  */
 
 package io.github.cakelier
-package tuples.space.response
+package tuples.space.client.response
 
 /** The enum representing all the different types of operations that can receive a result using a [[TemplateMaybeTupleResponse]].
   */
-private[response] enum TemplateMaybeTupleResponseType {
+private[client] enum TemplateMaybeTupleResponseType {
 
   /** The enum instance representing the "inp" operation. */
   case Inp extends TemplateMaybeTupleResponseType
diff --git a/src/main/scala/tuples/space/client/response/TemplateSeqTupleResponseType.scala b/src/main/scala/tuples/space/client/response/TemplateSeqTupleResponseType.scala
index df680a3..bfaf3fa 100644
--- a/src/main/scala/tuples/space/client/response/TemplateSeqTupleResponseType.scala
+++ b/src/main/scala/tuples/space/client/response/TemplateSeqTupleResponseType.scala
@@ -20,10 +20,10 @@
  */
 
 package io.github.cakelier
-package tuples.space.response
+package tuples.space.client.response
 
 /** The enum representing all the different types of operations that can receive a result using a [[TemplateSeqTupleResponse]]. */
-private[response] enum TemplateSeqTupleResponseType {
+private[client] enum TemplateSeqTupleResponseType {
 
   /** The enum instance representing the "inAll" operation. */
   case InAll extends TemplateSeqTupleResponseType
diff --git a/src/main/scala/tuples/space/client/response/TemplateTupleResponseType.scala b/src/main/scala/tuples/space/client/response/TemplateTupleResponseType.scala
index 6885bd8..a82e6ed 100644
--- a/src/main/scala/tuples/space/client/response/TemplateTupleResponseType.scala
+++ b/src/main/scala/tuples/space/client/response/TemplateTupleResponseType.scala
@@ -20,10 +20,10 @@
  */
 
 package io.github.cakelier
-package tuples.space.response
+package tuples.space.client.response
 
 /** The enum representing all the different types of operations that can receive a result using a [[TemplateTupleResponse]]. */
-private[response] enum TemplateTupleResponseType {
+private[client] enum TemplateTupleResponseType {
 
   /** The enum instance representing the "in" operation. */
   case In extends TemplateTupleResponseType
diff --git a/src/test/scala/tuples/space/client/JsonTupleSpaceTest.scala b/src/test/scala/tuples/space/client/JsonTupleSpaceTest.scala
index 9c86ae2..9bbe0a0 100644
--- a/src/test/scala/tuples/space/client/JsonTupleSpaceTest.scala
+++ b/src/test/scala/tuples/space/client/JsonTupleSpaceTest.scala
@@ -54,12 +54,11 @@ import org.scalatest.time.Span
 
 import AnyOps.*
 import tuples.space.*
+import tuples.space.client.request.*
+import tuples.space.client.request.RequestDeserializer.given
+import tuples.space.client.response.*
+import tuples.space.client.response.ResponseSerializer.given
 import tuples.space.JsonTuple.JsonNil
-import tuples.space.request.*
-import tuples.space.request.RequestDeserializer.given
-import tuples.space.response.*
-import tuples.space.response.Response.{ConnectionSuccessResponse, MergeSuccessResponse}
-import tuples.space.response.ResponseSerializer.given
 
 @SuppressWarnings(
   Array(
diff --git a/src/test/scala/tuples/space/client/request/RequestDeserializer.scala b/src/test/scala/tuples/space/client/request/RequestDeserializer.scala
index ac8383d..edb5339 100644
--- a/src/test/scala/tuples/space/client/request/RequestDeserializer.scala
+++ b/src/test/scala/tuples/space/client/request/RequestDeserializer.scala
@@ -20,12 +20,11 @@
  */
 
 package io.github.cakelier
-package tuples.space.request
+package tuples.space.client.request
 
 import io.circe.Decoder
 import io.circe.DecodingFailure
 
-import tuples.space.request.*
 import tuples.space.{JsonTemplate, JsonTuple}
 import tuples.space.JsonSerializable.given
 import AnyOps.*
diff --git a/src/test/scala/tuples/space/client/response/ResponseSerializer.scala b/src/test/scala/tuples/space/client/response/ResponseSerializer.scala
index d881ed5..73b72db 100644
--- a/src/test/scala/tuples/space/client/response/ResponseSerializer.scala
+++ b/src/test/scala/tuples/space/client/response/ResponseSerializer.scala
@@ -20,7 +20,7 @@
  */
 
 package io.github.cakelier
-package tuples.space.response
+package tuples.space.client.response
 
 import io.circe.Encoder
 import io.circe.Json