diff --git a/src/main/java/com/incognia/api/IncogniaAPI.java b/src/main/java/com/incognia/api/IncogniaAPI.java
index a04e384..b345377 100644
--- a/src/main/java/com/incognia/api/IncogniaAPI.java
+++ b/src/main/java/com/incognia/api/IncogniaAPI.java
@@ -7,13 +7,10 @@
 import com.incognia.common.utils.Asserts;
 import com.incognia.feedback.FeedbackEvent;
 import com.incognia.feedback.FeedbackIdentifiers;
-import com.incognia.feedback.PostFeedbackRequestBody;
-import com.incognia.onboarding.PostSignupRequestBody;
 import com.incognia.onboarding.RegisterSignupRequest;
 import com.incognia.onboarding.RegisterWebSignupRequest;
 import com.incognia.onboarding.SignupAssessment;
 import com.incognia.transaction.AddressType;
-import com.incognia.transaction.PostTransactionRequestBody;
 import com.incognia.transaction.TransactionAddress;
 import com.incognia.transaction.TransactionAssessment;
 import com.incognia.transaction.login.RegisterLoginRequest;
diff --git a/src/main/java/com/incognia/feedback/PostFeedbackRequestBody.java b/src/main/java/com/incognia/api/PostFeedbackRequestBody.java
similarity index 81%
rename from src/main/java/com/incognia/feedback/PostFeedbackRequestBody.java
rename to src/main/java/com/incognia/api/PostFeedbackRequestBody.java
index a4c4ac0..d3ed369 100644
--- a/src/main/java/com/incognia/feedback/PostFeedbackRequestBody.java
+++ b/src/main/java/com/incognia/api/PostFeedbackRequestBody.java
@@ -1,4 +1,4 @@
-package com.incognia.feedback;
+package com.incognia.api;
 
 import java.time.Instant;
 import lombok.Builder;
@@ -6,7 +6,7 @@
 
 @Value
 @Builder
-public class PostFeedbackRequestBody {
+class PostFeedbackRequestBody {
   String event;
   Instant occurredAt;
   Instant expiresAt;
diff --git a/src/main/java/com/incognia/onboarding/PostSignupRequestBody.java b/src/main/java/com/incognia/api/PostSignupRequestBody.java
similarity index 88%
rename from src/main/java/com/incognia/onboarding/PostSignupRequestBody.java
rename to src/main/java/com/incognia/api/PostSignupRequestBody.java
index 555b4c7..b554f9a 100644
--- a/src/main/java/com/incognia/onboarding/PostSignupRequestBody.java
+++ b/src/main/java/com/incognia/api/PostSignupRequestBody.java
@@ -1,4 +1,4 @@
-package com.incognia.onboarding;
+package com.incognia.api;
 
 import com.incognia.common.AdditionalLocation;
 import com.incognia.common.Coordinates;
@@ -11,7 +11,7 @@
 @Data
 @Builder
 @AllArgsConstructor
-public class PostSignupRequestBody {
+class PostSignupRequestBody {
   String installationId;
   String sessionToken;
   String addressLine;
diff --git a/src/main/java/com/incognia/transaction/PostTransactionRequestBody.java b/src/main/java/com/incognia/api/PostTransactionRequestBody.java
similarity index 88%
rename from src/main/java/com/incognia/transaction/PostTransactionRequestBody.java
rename to src/main/java/com/incognia/api/PostTransactionRequestBody.java
index c3897cf..fd2c27a 100644
--- a/src/main/java/com/incognia/transaction/PostTransactionRequestBody.java
+++ b/src/main/java/com/incognia/api/PostTransactionRequestBody.java
@@ -1,6 +1,7 @@
-package com.incognia.transaction;
+package com.incognia.api;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.incognia.transaction.TransactionAddress;
 import com.incognia.transaction.payment.PaymentMethod;
 import com.incognia.transaction.payment.PaymentValue;
 import java.util.Collections;
@@ -11,7 +12,7 @@
 
 @Value
 @Builder
-public class PostTransactionRequestBody {
+class PostTransactionRequestBody {
   String installationId;
   String accountId;
   String sessionToken;
diff --git a/src/test/java/com/incognia/api/IncogniaAPITest.java b/src/test/java/com/incognia/api/IncogniaAPITest.java
index e0a0448..e9d2ecd 100644
--- a/src/test/java/com/incognia/api/IncogniaAPITest.java
+++ b/src/test/java/com/incognia/api/IncogniaAPITest.java
@@ -3,7 +3,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import com.incognia.api.clients.TokenAwareDispatcher;
 import com.incognia.common.Address;
 import com.incognia.common.Coordinates;
 import com.incognia.common.Reason;
@@ -12,14 +11,12 @@
 import com.incognia.common.StructuredAddress;
 import com.incognia.feedback.FeedbackEvent;
 import com.incognia.feedback.FeedbackIdentifiers;
-import com.incognia.feedback.PostFeedbackRequestBody;
 import com.incognia.fixtures.AddressFixture;
 import com.incognia.fixtures.TokenCreationFixture;
 import com.incognia.onboarding.RegisterSignupRequest;
 import com.incognia.onboarding.RegisterWebSignupRequest;
 import com.incognia.onboarding.SignupAssessment;
 import com.incognia.transaction.AddressType;
-import com.incognia.transaction.PostTransactionRequestBody;
 import com.incognia.transaction.TransactionAddress;
 import com.incognia.transaction.TransactionAssessment;
 import com.incognia.transaction.login.RegisterLoginRequest;
diff --git a/src/test/java/com/incognia/api/clients/TokenAwareDispatcher.java b/src/test/java/com/incognia/api/TokenAwareDispatcher.java
similarity index 97%
rename from src/test/java/com/incognia/api/clients/TokenAwareDispatcher.java
rename to src/test/java/com/incognia/api/TokenAwareDispatcher.java
index 24b5ec6..84aa3d2 100644
--- a/src/test/java/com/incognia/api/clients/TokenAwareDispatcher.java
+++ b/src/test/java/com/incognia/api/TokenAwareDispatcher.java
@@ -1,12 +1,10 @@
-package com.incognia.api.clients;
+package com.incognia.api;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.incognia.feedback.PostFeedbackRequestBody;
+import com.incognia.api.clients.ObjectMapperFactory;
 import com.incognia.fixtures.ResourceUtils;
-import com.incognia.onboarding.PostSignupRequestBody;
-import com.incognia.transaction.PostTransactionRequestBody;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.UUID;
diff --git a/src/test/java/com/incognia/api/clients/TokenAwareNetworkingClientTest.java b/src/test/java/com/incognia/api/clients/TokenAwareNetworkingClientTest.java
index 1318d7c..4fad051 100644
--- a/src/test/java/com/incognia/api/clients/TokenAwareNetworkingClientTest.java
+++ b/src/test/java/com/incognia/api/clients/TokenAwareNetworkingClientTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.incognia.api.TokenAwareDispatcher;
 import com.incognia.common.exceptions.IncogniaAPIException;
 import com.incognia.common.exceptions.IncogniaException;
 import com.incognia.fixtures.TestRequestBody;