diff --git a/client/src/test/java/com/sinch/sdk/domains/sms/adapters/InboundsServiceTest.java b/client/src/test/java/com/sinch/sdk/domains/sms/adapters/InboundsServiceTest.java
index f75637c6..9d094bfe 100644
--- a/client/src/test/java/com/sinch/sdk/domains/sms/adapters/InboundsServiceTest.java
+++ b/client/src/test/java/com/sinch/sdk/domains/sms/adapters/InboundsServiceTest.java
@@ -40,19 +40,19 @@ class InboundsServiceTest extends BaseTest {
 
   String uriPartID = "foovalue";
 
-  @GivenJsonResource("/domains/sms/v1/MOBinaryDto.json")
+  @GivenJsonResource("/domains/sms/v1/inbounds/MOBinaryDto.json")
   InboundDto binary;
 
-  @GivenJsonResource("/domains/sms/v1/MOTextDto.json")
+  @GivenJsonResource("/domains/sms/v1/inbounds/MOTextDto.json")
   InboundDto text;
 
-  @GivenJsonResource("/domains/sms/v1/InboundsListResponseDtoPage0.json")
+  @GivenJsonResource("/domains/sms/v1/inbounds/response/internal/InboundsListResponseDtoPage0.json")
   ApiInboundListDto inboundsLisResponseDtoPage0;
 
-  @GivenJsonResource("/domains/sms/v1/InboundsListResponseDtoPage1.json")
+  @GivenJsonResource("/domains/sms/v1/inbounds/response/internal/InboundsListResponseDtoPage1.json")
   ApiInboundListDto inboundsLisResponseDtoPage1;
 
-  @GivenJsonResource("/domains/sms/v1/InboundsListResponseDtoPage2.json")
+  @GivenJsonResource("/domains/sms/v1/inbounds/response/internal/InboundsListResponseDtoPage2.json")
   ApiInboundListDto inboundsLisResponseDtoPage2;
 
   @BeforeEach
diff --git a/client/src/test/java/com/sinch/sdk/domains/sms/adapters/WebHooksServiceTest.java b/client/src/test/java/com/sinch/sdk/domains/sms/adapters/WebHooksServiceTest.java
index afe60422..1e863089 100644
--- a/client/src/test/java/com/sinch/sdk/domains/sms/adapters/WebHooksServiceTest.java
+++ b/client/src/test/java/com/sinch/sdk/domains/sms/adapters/WebHooksServiceTest.java
@@ -28,10 +28,10 @@
 @TestWithResources
 public class WebHooksServiceTest extends BaseTest {
 
-  @GivenTextResource("/domains/sms/v1/MOBinaryDto.json")
+  @GivenTextResource("/domains/sms/v1/inbounds/MOBinaryDto.json")
   String incomingSMSBinaryJsonString;
 
-  @GivenTextResource("/domains/sms/v1/MOTextDto.json")
+  @GivenTextResource("/domains/sms/v1/inbounds/MOTextDto.json")
   String incomingSMSTextJsonString;
 
   @GivenTextResource("/domains/sms/v1/DeliveryReportRecipientSMSDto.json")
diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/dto/v1/InboundDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/dto/v1/InboundDtoTest.java
index 8e36a4b9..83b73b8d 100644
--- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/dto/v1/InboundDtoTest.java
+++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/dto/v1/InboundDtoTest.java
@@ -10,10 +10,10 @@
 @TestWithResources
 class InboundDtoTest extends BaseTest {
 
-  @GivenJsonResource("/domains/sms/v1/MOBinaryDto.json")
+  @GivenJsonResource("/domains/sms/v1/inbounds/MOBinaryDto.json")
   InboundDto loadedBinaryMessage;
 
-  @GivenJsonResource("/domains/sms/v1/MOTextDto.json")
+  @GivenJsonResource("/domains/sms/v1/inbounds/MOTextDto.json")
   InboundDto loadedTextMessage;
 
   MOBinaryDto binaryDTO =
diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/dto/v1/MOBinaryDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/dto/v1/MOBinaryDtoTest.java
index 97791df9..6cea5b35 100644
--- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/dto/v1/MOBinaryDtoTest.java
+++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/dto/v1/MOBinaryDtoTest.java
@@ -14,10 +14,10 @@
 @TestWithResources
 public class MOBinaryDtoTest extends BaseTest {
 
-  @GivenJsonResource("/domains/sms/v1/MOBinaryDto.json")
+  @GivenJsonResource("/domains/sms/v1/inbounds/MOBinaryDto.json")
   MOBinaryDto loadedDto;
 
-  @GivenTextResource("/domains/sms/v1/MOBinaryDto.json")
+  @GivenTextResource("/domains/sms/v1/inbounds/MOBinaryDto.json")
   String jsonStringDto;
 
   public static MOBinaryDto dto =
diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/dto/v1/MOTextDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/dto/v1/MOTextDtoTest.java
index 066aa97a..917f554c 100644
--- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/dto/v1/MOTextDtoTest.java
+++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/sms/models/dto/v1/MOTextDtoTest.java
@@ -14,10 +14,10 @@
 @TestWithResources
 public class MOTextDtoTest extends BaseTest {
 
-  @GivenJsonResource("/domains/sms/v1/MOTextDto.json")
+  @GivenJsonResource("/domains/sms/v1/inbounds/MOTextDto.json")
   MOTextDto loadedDto;
 
-  @GivenTextResource("/domains/sms/v1/MOTextDto.json")
+  @GivenTextResource("/domains/sms/v1/inbounds/MOTextDto.json")
   String jsonStringDto;
 
   public static MOTextDto dto =
diff --git a/openapi-contracts/src/test/resources/domains/sms/v1/MOBinaryDto.json b/openapi-contracts/src/test/resources/domains/sms/v1/inbounds/MOBinaryDto.json
similarity index 100%
rename from openapi-contracts/src/test/resources/domains/sms/v1/MOBinaryDto.json
rename to openapi-contracts/src/test/resources/domains/sms/v1/inbounds/MOBinaryDto.json
diff --git a/openapi-contracts/src/test/resources/domains/sms/v1/MOTextDto.json b/openapi-contracts/src/test/resources/domains/sms/v1/inbounds/MOTextDto.json
similarity index 100%
rename from openapi-contracts/src/test/resources/domains/sms/v1/MOTextDto.json
rename to openapi-contracts/src/test/resources/domains/sms/v1/inbounds/MOTextDto.json
diff --git a/openapi-contracts/src/test/resources/domains/sms/v1/InboundsListResponseDtoPage0.json b/openapi-contracts/src/test/resources/domains/sms/v1/inbounds/response/internal/InboundsListResponseDtoPage0.json
similarity index 100%
rename from openapi-contracts/src/test/resources/domains/sms/v1/InboundsListResponseDtoPage0.json
rename to openapi-contracts/src/test/resources/domains/sms/v1/inbounds/response/internal/InboundsListResponseDtoPage0.json
diff --git a/openapi-contracts/src/test/resources/domains/sms/v1/InboundsListResponseDtoPage1.json b/openapi-contracts/src/test/resources/domains/sms/v1/inbounds/response/internal/InboundsListResponseDtoPage1.json
similarity index 100%
rename from openapi-contracts/src/test/resources/domains/sms/v1/InboundsListResponseDtoPage1.json
rename to openapi-contracts/src/test/resources/domains/sms/v1/inbounds/response/internal/InboundsListResponseDtoPage1.json
diff --git a/openapi-contracts/src/test/resources/domains/sms/v1/InboundsListResponseDtoPage2.json b/openapi-contracts/src/test/resources/domains/sms/v1/inbounds/response/internal/InboundsListResponseDtoPage2.json
similarity index 100%
rename from openapi-contracts/src/test/resources/domains/sms/v1/InboundsListResponseDtoPage2.json
rename to openapi-contracts/src/test/resources/domains/sms/v1/inbounds/response/internal/InboundsListResponseDtoPage2.json