From 56f5a904aa576ab54e5f92b013a7b6ad95859f0f Mon Sep 17 00:00:00 2001
From: Jakub Piasecki <jakub@piaseccy.pl>
Date: Tue, 30 Jul 2024 13:27:46 +0200
Subject: [PATCH] Moving RecurringPayment to new namespace

---
 src/Api/{ => v3}/RecurringPayment.php         | 31 +++++++++---------
 .../{ => v3}/RecurringPaymentInterface.php    | 32 +++++++++----------
 .../RecurringPayment/{ => v3}/Agreement.php   | 14 ++++----
 .../{ => v3}/AgreementInterval.php            |  2 +-
 .../{ => v3}/CampaignRequest.php              |  2 +-
 .../RecurringPayment/{ => v3}/Charge.php      |  6 ++--
 .../{ => v3}/InitialCharge.php                |  2 +-
 .../RecurringPayment/{ => v3}/Interval.php    |  2 +-
 .../RecurringPayment/{ => v3}/Pricing.php     |  2 +-
 .../{ => v3}/RequestCreateAgreement.php       | 18 +++++------
 .../{ => v3}/RequestCreateCharge.php          |  2 +-
 .../{ => v3}/RequestRefundCharge.php          |  2 +-
 .../{ => v3}/RequestUpdateAgreement.php       |  6 ++--
 .../{ => v3}/ResponseCaptureCharge.php        |  4 +--
 .../{ => v3}/ResponseCreateAgreement.php      |  2 +-
 .../{ => v3}/ResponseCreateCharge.php         |  2 +-
 .../{ => v3}/ResponseGetAgreement.php         |  4 +--
 .../{ => v3}/ResponseGetCharge.php            |  4 +--
 .../{ => v3}/ResponseUpdateAgreement.php      |  2 +-
 .../RecurringPayment/{ => v3}/Status.php      |  2 +-
 .../RecurringPayment/{ => v3}/Summary.php     |  2 +-
 .../{ => v3}/TransactionType.php              |  2 +-
 .../{ => v3}/CancelCharge.php                 |  6 +---
 .../{ => v3}/CaptureCharge.php                |  6 +---
 .../{ => v3}/CreateAgreement.php              | 12 +++----
 .../{ => v3}/CreateCharge.php                 | 13 ++++----
 .../{ => v3}/GetAgreement.php                 |  8 ++---
 .../{ => v3}/GetAgreements.php                |  8 ++---
 .../RecurringPayment/{ => v3}/GetCharge.php   |  8 ++---
 .../RecurringPayment/{ => v3}/GetCharges.php  |  8 ++---
 .../{ => v3}/RecurringPaymentResourceBase.php |  2 +-
 .../{ => v3}/RefundCharge.php                 | 10 ++----
 .../{ => v3}/UpdateAgreement.php              |  9 +++---
 .../Integration/Api/RecurringPaymentsTest.php | 30 ++++++++---------
 34 files changed, 123 insertions(+), 142 deletions(-)
 rename src/Api/{ => v3}/RecurringPayment.php (80%)
 rename src/Api/{ => v3}/RecurringPaymentInterface.php (54%)
 rename src/Model/RecurringPayment/{ => v3}/Agreement.php (87%)
 rename src/Model/RecurringPayment/{ => v3}/AgreementInterval.php (96%)
 rename src/Model/RecurringPayment/{ => v3}/CampaignRequest.php (95%)
 rename src/Model/RecurringPayment/{ => v3}/Charge.php (93%)
 rename src/Model/RecurringPayment/{ => v3}/InitialCharge.php (97%)
 rename src/Model/RecurringPayment/{ => v3}/Interval.php (87%)
 rename src/Model/RecurringPayment/{ => v3}/Pricing.php (96%)
 rename src/Model/RecurringPayment/{ => v3}/RequestCreateAgreement.php (86%)
 rename src/Model/RecurringPayment/{ => v3}/RequestCreateCharge.php (97%)
 rename src/Model/RecurringPayment/{ => v3}/RequestRefundCharge.php (93%)
 rename src/Model/RecurringPayment/{ => v3}/RequestUpdateAgreement.php (89%)
 rename src/Model/RecurringPayment/{ => v3}/ResponseCaptureCharge.php (56%)
 rename src/Model/RecurringPayment/{ => v3}/ResponseCreateAgreement.php (95%)
 rename src/Model/RecurringPayment/{ => v3}/ResponseCreateCharge.php (88%)
 rename src/Model/RecurringPayment/{ => v3}/ResponseGetAgreement.php (59%)
 rename src/Model/RecurringPayment/{ => v3}/ResponseGetCharge.php (57%)
 rename src/Model/RecurringPayment/{ => v3}/ResponseUpdateAgreement.php (89%)
 rename src/Model/RecurringPayment/{ => v3}/Status.php (88%)
 rename src/Model/RecurringPayment/{ => v3}/Summary.php (93%)
 rename src/Model/RecurringPayment/{ => v3}/TransactionType.php (88%)
 rename src/Resource/RecurringPayment/{ => v3}/CancelCharge.php (81%)
 rename src/Resource/RecurringPayment/{ => v3}/CaptureCharge.php (81%)
 rename src/Resource/RecurringPayment/{ => v3}/CreateAgreement.php (75%)
 rename src/Resource/RecurringPayment/{ => v3}/CreateCharge.php (76%)
 rename src/Resource/RecurringPayment/{ => v3}/GetAgreement.php (79%)
 rename src/Resource/RecurringPayment/{ => v3}/GetAgreements.php (71%)
 rename src/Resource/RecurringPayment/{ => v3}/GetCharge.php (80%)
 rename src/Resource/RecurringPayment/{ => v3}/GetCharges.php (79%)
 rename src/Resource/RecurringPayment/{ => v3}/RecurringPaymentResourceBase.php (96%)
 rename src/Resource/RecurringPayment/{ => v3}/RefundCharge.php (77%)
 rename src/Resource/RecurringPayment/{ => v3}/UpdateAgreement.php (79%)

diff --git a/src/Api/RecurringPayment.php b/src/Api/v3/RecurringPayment.php
similarity index 80%
rename from src/Api/RecurringPayment.php
rename to src/Api/v3/RecurringPayment.php
index 51d98b5..a06d311 100644
--- a/src/Api/RecurringPayment.php
+++ b/src/Api/v3/RecurringPayment.php
@@ -1,22 +1,23 @@
 <?php
 
-namespace zaporylie\Vipps\Api;
+namespace zaporylie\Vipps\Api\v3;
 
+use zaporylie\Vipps\Api\ApiBase;
 use zaporylie\Vipps\Exceptions\Api\InvalidArgumentException;
-use zaporylie\Vipps\Model\RecurringPayment\RequestCreateAgreement;
-use zaporylie\Vipps\Model\RecurringPayment\RequestCreateCharge;
-use zaporylie\Vipps\Model\RecurringPayment\RequestRefundCharge;
-use zaporylie\Vipps\Model\RecurringPayment\RequestUpdateAgreement;
-use zaporylie\Vipps\Resource\RecurringPayment\CancelCharge;
-use zaporylie\Vipps\Resource\RecurringPayment\CaptureCharge;
-use zaporylie\Vipps\Resource\RecurringPayment\CreateAgreement;
-use zaporylie\Vipps\Resource\RecurringPayment\CreateCharge;
-use zaporylie\Vipps\Resource\RecurringPayment\GetAgreement;
-use zaporylie\Vipps\Resource\RecurringPayment\GetAgreements;
-use zaporylie\Vipps\Resource\RecurringPayment\GetCharge;
-use zaporylie\Vipps\Resource\RecurringPayment\GetCharges;
-use zaporylie\Vipps\Resource\RecurringPayment\RefundCharge;
-use zaporylie\Vipps\Resource\RecurringPayment\UpdateAgreement;
+use zaporylie\Vipps\Model\RecurringPayment\v3\RequestCreateAgreement;
+use zaporylie\Vipps\Model\RecurringPayment\v3\RequestCreateCharge;
+use zaporylie\Vipps\Model\RecurringPayment\v3\RequestRefundCharge;
+use zaporylie\Vipps\Model\RecurringPayment\v3\RequestUpdateAgreement;
+use zaporylie\Vipps\Resource\RecurringPayment\v3\CancelCharge;
+use zaporylie\Vipps\Resource\RecurringPayment\v3\CaptureCharge;
+use zaporylie\Vipps\Resource\RecurringPayment\v3\CreateAgreement;
+use zaporylie\Vipps\Resource\RecurringPayment\v3\CreateCharge;
+use zaporylie\Vipps\Resource\RecurringPayment\v3\GetAgreement;
+use zaporylie\Vipps\Resource\RecurringPayment\v3\GetAgreements;
+use zaporylie\Vipps\Resource\RecurringPayment\v3\GetCharge;
+use zaporylie\Vipps\Resource\RecurringPayment\v3\GetCharges;
+use zaporylie\Vipps\Resource\RecurringPayment\v3\RefundCharge;
+use zaporylie\Vipps\Resource\RecurringPayment\v3\UpdateAgreement;
 use zaporylie\Vipps\VippsInterface;
 
 /**
diff --git a/src/Api/RecurringPaymentInterface.php b/src/Api/v3/RecurringPaymentInterface.php
similarity index 54%
rename from src/Api/RecurringPaymentInterface.php
rename to src/Api/v3/RecurringPaymentInterface.php
index 2f582ad..553664a 100644
--- a/src/Api/RecurringPaymentInterface.php
+++ b/src/Api/v3/RecurringPaymentInterface.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace zaporylie\Vipps\Api;
+namespace zaporylie\Vipps\Api\v3;
 
-use zaporylie\Vipps\Model\RecurringPayment\RequestCreateAgreement;
-use zaporylie\Vipps\Model\RecurringPayment\RequestCreateCharge;
-use zaporylie\Vipps\Model\RecurringPayment\RequestRefundCharge;
-use zaporylie\Vipps\Model\RecurringPayment\RequestUpdateAgreement;
+use zaporylie\Vipps\Model\RecurringPayment\v3\RequestCreateAgreement;
+use zaporylie\Vipps\Model\RecurringPayment\v3\RequestCreateCharge;
+use zaporylie\Vipps\Model\RecurringPayment\v3\RequestRefundCharge;
+use zaporylie\Vipps\Model\RecurringPayment\v3\RequestUpdateAgreement;
 
 /**
  * Interface PaymentInterface
@@ -16,34 +16,34 @@ interface RecurringPaymentInterface
 {
 
     /**
-     * @param \zaporylie\Vipps\Model\RecurringPayment\RequestCreateAgreement
+     * @param \zaporylie\Vipps\Model\RecurringPayment\v3\RequestCreateAgreement
      *
-     * @return \zaporylie\Vipps\Model\RecurringPayment\ResponseCreateAgreement
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\ResponseCreateAgreement
      */
     public function createAgreement(RequestCreateAgreement $requestCreateAgreement);
 
     /**
-     * @return \zaporylie\Vipps\Model\RecurringPayment\ResponseGetAgreement[]
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\ResponseGetAgreement[]
      */
     public function getAgreements();
 
     /**
-     * @return \zaporylie\Vipps\Model\RecurringPayment\ResponseGetAgreement
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\ResponseGetAgreement
      */
     public function getAgreement($agreement_id);
 
     /**
      * @param $agreement_id
-     * @param \zaporylie\Vipps\Model\RecurringPayment\RequestUpdateAgreement $request
+     * @param \zaporylie\Vipps\Model\RecurringPayment\v3\RequestUpdateAgreement $request
      *
-     * @return \zaporylie\Vipps\Model\RecurringPayment\ResponseUpdateAgreement
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\ResponseUpdateAgreement
      */
     public function updateAgreement($agreement_id, RequestUpdateAgreement $request);
 
     /**
      * @param $agreement_id
      *
-     * @return \zaporylie\Vipps\Model\RecurringPayment\Charge[]
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\Charge[]
      */
     public function getCharges($agreement_id);
 
@@ -51,15 +51,15 @@ public function getCharges($agreement_id);
      * @param $agreement_id
      * @param $charge_id
      *
-     * @return \zaporylie\Vipps\Model\RecurringPayment\Charge
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\Charge
      */
     public function getCharge($agreement_id, $charge_id);
 
     /**
      * @param $agreement_id
-     * @param \zaporylie\Vipps\Model\RecurringPayment\RequestCreateCharge $request
+     * @param \zaporylie\Vipps\Model\RecurringPayment\v3\RequestCreateCharge $request
      *
-     * @return \zaporylie\Vipps\Model\RecurringPayment\ResponseCreateCharge
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\ResponseCreateCharge
      */
     public function createCharge($agreement_id, RequestCreateCharge $request);
 
@@ -82,7 +82,7 @@ public function captureCharge($agreement_id, $charge_id);
     /**
      * @param string $agreement_id
      * @param string $charge_id
-     * @param \zaporylie\Vipps\Model\RecurringPayment\RequestRefundCharge $requestObject
+     * @param \zaporylie\Vipps\Model\RecurringPayment\v3\RequestRefundCharge $requestObject
      *
      * @return string
      */
diff --git a/src/Model/RecurringPayment/Agreement.php b/src/Model/RecurringPayment/v3/Agreement.php
similarity index 87%
rename from src/Model/RecurringPayment/Agreement.php
rename to src/Model/RecurringPayment/v3/Agreement.php
index 1662385..4d05b95 100644
--- a/src/Model/RecurringPayment/Agreement.php
+++ b/src/Model/RecurringPayment/v3/Agreement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use JMS\Serializer\Annotation as Serializer;
 
@@ -13,7 +13,7 @@ class Agreement
 {
 
     /**
-     * @var \zaporylie\Vipps\Model\RecurringPayment\CampaignRequest
+     * @var \zaporylie\Vipps\Model\RecurringPayment\v3\CampaignRequest
      * @Serializer\Type("zaporylie\Vipps\Model\RecurringPayment\CampaignRequest")
      */
     protected $campaign;
@@ -25,13 +25,13 @@ class Agreement
     protected $id;
 
     /**
-     * @var \zaporylie\Vipps\Model\RecurringPayment\AgreementInterval
+     * @var \zaporylie\Vipps\Model\RecurringPayment\v3\AgreementInterval
      * @Serializer\Type("zaporylie\Vipps\Model\RecurringPayment\AgreementInterval")
      */
     protected $interval;
 
     /**
-     * @var \zaporylie\Vipps\Model\RecurringPayment\Pricing
+     * @var \zaporylie\Vipps\Model\RecurringPayment\v3\Pricing
      * @Serializer\Type("zaporylie\Vipps\Model\RecurringPayment\Pricing")
      */
     protected $pricing;
@@ -87,7 +87,7 @@ class Agreement
     /**
      * Gets campaign value.
      *
-     * @return \zaporylie\Vipps\Model\RecurringPayment\CampaignRequest
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\CampaignRequest
      */
     public function getCampaign()
     {
@@ -107,7 +107,7 @@ public function getId()
     /**
      * Gets interval value.
      *
-     * @return \zaporylie\Vipps\Model\RecurringPayment\AgreementInterval
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\AgreementInterval
      */
     public function getInterval()
     {
@@ -117,7 +117,7 @@ public function getInterval()
     /**
      * Gets price value.
      *
-     * @return \zaporylie\Vipps\Model\RecurringPayment\Pricing
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\Pricing
      */
     public function getPricing()
     {
diff --git a/src/Model/RecurringPayment/AgreementInterval.php b/src/Model/RecurringPayment/v3/AgreementInterval.php
similarity index 96%
rename from src/Model/RecurringPayment/AgreementInterval.php
rename to src/Model/RecurringPayment/v3/AgreementInterval.php
index 5ba746d..41c5c87 100644
--- a/src/Model/RecurringPayment/AgreementInterval.php
+++ b/src/Model/RecurringPayment/v3/AgreementInterval.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/src/Model/RecurringPayment/CampaignRequest.php b/src/Model/RecurringPayment/v3/CampaignRequest.php
similarity index 95%
rename from src/Model/RecurringPayment/CampaignRequest.php
rename to src/Model/RecurringPayment/v3/CampaignRequest.php
index 43e5f87..525cdc0 100644
--- a/src/Model/RecurringPayment/CampaignRequest.php
+++ b/src/Model/RecurringPayment/v3/CampaignRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/src/Model/RecurringPayment/Charge.php b/src/Model/RecurringPayment/v3/Charge.php
similarity index 93%
rename from src/Model/RecurringPayment/Charge.php
rename to src/Model/RecurringPayment/v3/Charge.php
index 7770832..9a38eaa 100644
--- a/src/Model/RecurringPayment/Charge.php
+++ b/src/Model/RecurringPayment/v3/Charge.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use JMS\Serializer\Annotation as Serializer;
 
@@ -18,7 +18,7 @@ class Charge
     protected $amount;
 
     /**
-     * @var \zaporylie\Vipps\Model\RecurringPayment\Summary
+     * @var \zaporylie\Vipps\Model\RecurringPayment\v3\Summary
      * @Serializer\Type("zaporylie\Vipps\Model\RecurringPayment\Summary")
      */
     protected $summary;
@@ -84,7 +84,7 @@ public function getAmount()
     /**
      * Gets amountRefunded value.
      *
-     * @return \zaporylie\Vipps\Model\RecurringPayment\Summary
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\Summary
      */
     public function getSummary()
     {
diff --git a/src/Model/RecurringPayment/InitialCharge.php b/src/Model/RecurringPayment/v3/InitialCharge.php
similarity index 97%
rename from src/Model/RecurringPayment/InitialCharge.php
rename to src/Model/RecurringPayment/v3/InitialCharge.php
index 186ecde..33eb9ee 100644
--- a/src/Model/RecurringPayment/InitialCharge.php
+++ b/src/Model/RecurringPayment/v3/InitialCharge.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/src/Model/RecurringPayment/Interval.php b/src/Model/RecurringPayment/v3/Interval.php
similarity index 87%
rename from src/Model/RecurringPayment/Interval.php
rename to src/Model/RecurringPayment/v3/Interval.php
index 3a314a1..49e257b 100644
--- a/src/Model/RecurringPayment/Interval.php
+++ b/src/Model/RecurringPayment/v3/Interval.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use Eloquent\Enumeration\AbstractEnumeration;
 
diff --git a/src/Model/RecurringPayment/Pricing.php b/src/Model/RecurringPayment/v3/Pricing.php
similarity index 96%
rename from src/Model/RecurringPayment/Pricing.php
rename to src/Model/RecurringPayment/v3/Pricing.php
index fb6773c..0b4824f 100644
--- a/src/Model/RecurringPayment/Pricing.php
+++ b/src/Model/RecurringPayment/v3/Pricing.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/src/Model/RecurringPayment/RequestCreateAgreement.php b/src/Model/RecurringPayment/v3/RequestCreateAgreement.php
similarity index 86%
rename from src/Model/RecurringPayment/RequestCreateAgreement.php
rename to src/Model/RecurringPayment/v3/RequestCreateAgreement.php
index 88e6ab9..a9cd002 100644
--- a/src/Model/RecurringPayment/RequestCreateAgreement.php
+++ b/src/Model/RecurringPayment/v3/RequestCreateAgreement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use JMS\Serializer\Annotation as Serializer;
 
@@ -12,7 +12,7 @@
 class RequestCreateAgreement
 {
     /**
-     * @var \zaporylie\Vipps\Model\RecurringPayment\CampaignRequest
+     * @var \zaporylie\Vipps\Model\RecurringPayment\v3\CampaignRequest
      * @Serializer\Type("zaporylie\Vipps\Model\RecurringPayment\CampaignRequest")
      */
     protected $campaign;
@@ -24,13 +24,13 @@ class RequestCreateAgreement
     protected $customerPhoneNumber;
 
     /**
-     * @var \zaporylie\Vipps\Model\RecurringPayment\InitialCharge
+     * @var \zaporylie\Vipps\Model\RecurringPayment\v3\InitialCharge
      * @Serializer\Type("zaporylie\Vipps\Model\RecurringPayment\InitialCharge")
      */
     protected $initialCharge;
 
     /**
-     * @var \zaporylie\Vipps\Model\RecurringPayment\AgreementInterval
+     * @var \zaporylie\Vipps\Model\RecurringPayment\v3\AgreementInterval
      * @Serializer\Type("zaporylie\Vipps\Model\RecurringPayment\AgreementInterval")
      */
     protected $interval;
@@ -54,7 +54,7 @@ class RequestCreateAgreement
     protected $merchantRedirectUrl;
 
     /**
-     * @var \zaporylie\Vipps\Model\RecurringPayment\Pricing
+     * @var \zaporylie\Vipps\Model\RecurringPayment\v3\Pricing
      * @Serializer\Type("zaporylie\Vipps\Model\RecurringPayment\Pricing")
      */
     protected $pricing;
@@ -80,7 +80,7 @@ class RequestCreateAgreement
     /**
      * Sets campaign variable.
      *
-     * @param \zaporylie\Vipps\Model\RecurringPayment\CampaignRequest $campaign
+     * @param \zaporylie\Vipps\Model\RecurringPayment\v3\CampaignRequest $campaign
      *
      * @return $this
      */
@@ -106,7 +106,7 @@ public function setCustomerPhoneNumber($customerPhoneNumber)
     /**
      * Sets initialCharge variable.
      *
-     * @param \zaporylie\Vipps\Model\RecurringPayment\InitialCharge $initialCharge
+     * @param \zaporylie\Vipps\Model\RecurringPayment\v3\InitialCharge $initialCharge
      *
      * @return $this
      */
@@ -119,7 +119,7 @@ public function setInitialCharge(InitialCharge $initialCharge)
     /**
      * Sets interval variable.
      *
-     * @param \zaporylie\Vipps\Model\RecurringPayment\AgreementInterval $interval
+     * @param \zaporylie\Vipps\Model\RecurringPayment\v3\AgreementInterval $interval
      *
      * @return $this
      */
@@ -171,7 +171,7 @@ public function setMerchantRedirectUrl($merchantRedirectUrl)
     /**
      * Sets price variable.
      *
-     * @param \zaporylie\Vipps\Model\RecurringPayment\Pricing
+     * @param \zaporylie\Vipps\Model\RecurringPayment\v3\Pricing
      *
      * @return $this
      */
diff --git a/src/Model/RecurringPayment/RequestCreateCharge.php b/src/Model/RecurringPayment/v3/RequestCreateCharge.php
similarity index 97%
rename from src/Model/RecurringPayment/RequestCreateCharge.php
rename to src/Model/RecurringPayment/v3/RequestCreateCharge.php
index 59d7023..9be89cd 100644
--- a/src/Model/RecurringPayment/RequestCreateCharge.php
+++ b/src/Model/RecurringPayment/v3/RequestCreateCharge.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/src/Model/RecurringPayment/RequestRefundCharge.php b/src/Model/RecurringPayment/v3/RequestRefundCharge.php
similarity index 93%
rename from src/Model/RecurringPayment/RequestRefundCharge.php
rename to src/Model/RecurringPayment/v3/RequestRefundCharge.php
index 21dc59e..2b38fd7 100644
--- a/src/Model/RecurringPayment/RequestRefundCharge.php
+++ b/src/Model/RecurringPayment/v3/RequestRefundCharge.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/src/Model/RecurringPayment/RequestUpdateAgreement.php b/src/Model/RecurringPayment/v3/RequestUpdateAgreement.php
similarity index 89%
rename from src/Model/RecurringPayment/RequestUpdateAgreement.php
rename to src/Model/RecurringPayment/v3/RequestUpdateAgreement.php
index ba635e8..4e8068d 100644
--- a/src/Model/RecurringPayment/RequestUpdateAgreement.php
+++ b/src/Model/RecurringPayment/v3/RequestUpdateAgreement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use JMS\Serializer\Annotation as Serializer;
 
@@ -13,7 +13,7 @@ class RequestUpdateAgreement
 {
 
     /**
-     * @var \zaporylie\Vipps\Model\RecurringPayment\Pricing
+     * @var \zaporylie\Vipps\Model\RecurringPayment\v3\Pricing
      * @Serializer\Type("zaporylie\Vipps\Model\RecurringPayment\Pricing")
      */
     protected $pricing;
@@ -39,7 +39,7 @@ class RequestUpdateAgreement
     /**
      * Sets price variable.
      *
-     * @param \zaporylie\Vipps\Model\RecurringPayment\Pricing $price
+     * @param \zaporylie\Vipps\Model\RecurringPayment\v3\Pricing $price
      *
      * @return $this
      */
diff --git a/src/Model/RecurringPayment/ResponseCaptureCharge.php b/src/Model/RecurringPayment/v3/ResponseCaptureCharge.php
similarity index 56%
rename from src/Model/RecurringPayment/ResponseCaptureCharge.php
rename to src/Model/RecurringPayment/v3/ResponseCaptureCharge.php
index 7df709f..977019b 100644
--- a/src/Model/RecurringPayment/ResponseCaptureCharge.php
+++ b/src/Model/RecurringPayment/v3/ResponseCaptureCharge.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
-
-use JMS\Serializer\Annotation as Serializer;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 /**
  * Class ResponseCaptureCharge
diff --git a/src/Model/RecurringPayment/ResponseCreateAgreement.php b/src/Model/RecurringPayment/v3/ResponseCreateAgreement.php
similarity index 95%
rename from src/Model/RecurringPayment/ResponseCreateAgreement.php
rename to src/Model/RecurringPayment/v3/ResponseCreateAgreement.php
index 07a943d..0ad7909 100644
--- a/src/Model/RecurringPayment/ResponseCreateAgreement.php
+++ b/src/Model/RecurringPayment/v3/ResponseCreateAgreement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/src/Model/RecurringPayment/ResponseCreateCharge.php b/src/Model/RecurringPayment/v3/ResponseCreateCharge.php
similarity index 88%
rename from src/Model/RecurringPayment/ResponseCreateCharge.php
rename to src/Model/RecurringPayment/v3/ResponseCreateCharge.php
index da4d7f3..bae0833 100644
--- a/src/Model/RecurringPayment/ResponseCreateCharge.php
+++ b/src/Model/RecurringPayment/v3/ResponseCreateCharge.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/src/Model/RecurringPayment/ResponseGetAgreement.php b/src/Model/RecurringPayment/v3/ResponseGetAgreement.php
similarity index 59%
rename from src/Model/RecurringPayment/ResponseGetAgreement.php
rename to src/Model/RecurringPayment/v3/ResponseGetAgreement.php
index 4c61cfe..98a6179 100644
--- a/src/Model/RecurringPayment/ResponseGetAgreement.php
+++ b/src/Model/RecurringPayment/v3/ResponseGetAgreement.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
-
-use JMS\Serializer\Annotation as Serializer;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 /**
  * Class ResponseGetAgreement
diff --git a/src/Model/RecurringPayment/ResponseGetCharge.php b/src/Model/RecurringPayment/v3/ResponseGetCharge.php
similarity index 57%
rename from src/Model/RecurringPayment/ResponseGetCharge.php
rename to src/Model/RecurringPayment/v3/ResponseGetCharge.php
index 283ac63..5f7ff45 100644
--- a/src/Model/RecurringPayment/ResponseGetCharge.php
+++ b/src/Model/RecurringPayment/v3/ResponseGetCharge.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
-
-use JMS\Serializer\Annotation as Serializer;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 /**
  * Class ResponseGetCharge
diff --git a/src/Model/RecurringPayment/ResponseUpdateAgreement.php b/src/Model/RecurringPayment/v3/ResponseUpdateAgreement.php
similarity index 89%
rename from src/Model/RecurringPayment/ResponseUpdateAgreement.php
rename to src/Model/RecurringPayment/v3/ResponseUpdateAgreement.php
index b6bfdce..1390d84 100644
--- a/src/Model/RecurringPayment/ResponseUpdateAgreement.php
+++ b/src/Model/RecurringPayment/v3/ResponseUpdateAgreement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/src/Model/RecurringPayment/Status.php b/src/Model/RecurringPayment/v3/Status.php
similarity index 88%
rename from src/Model/RecurringPayment/Status.php
rename to src/Model/RecurringPayment/v3/Status.php
index 0902bed..bef3888 100644
--- a/src/Model/RecurringPayment/Status.php
+++ b/src/Model/RecurringPayment/v3/Status.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use Eloquent\Enumeration\AbstractEnumeration;
 
diff --git a/src/Model/RecurringPayment/Summary.php b/src/Model/RecurringPayment/v3/Summary.php
similarity index 93%
rename from src/Model/RecurringPayment/Summary.php
rename to src/Model/RecurringPayment/v3/Summary.php
index acc9848..d604ec3 100644
--- a/src/Model/RecurringPayment/Summary.php
+++ b/src/Model/RecurringPayment/v3/Summary.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/src/Model/RecurringPayment/TransactionType.php b/src/Model/RecurringPayment/v3/TransactionType.php
similarity index 88%
rename from src/Model/RecurringPayment/TransactionType.php
rename to src/Model/RecurringPayment/v3/TransactionType.php
index 83f73c9..ccb2f07 100644
--- a/src/Model/RecurringPayment/TransactionType.php
+++ b/src/Model/RecurringPayment/v3/TransactionType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Model\RecurringPayment;
+namespace zaporylie\Vipps\Model\RecurringPayment\v3;
 
 use Eloquent\Enumeration\AbstractEnumeration;
 
diff --git a/src/Resource/RecurringPayment/CancelCharge.php b/src/Resource/RecurringPayment/v3/CancelCharge.php
similarity index 81%
rename from src/Resource/RecurringPayment/CancelCharge.php
rename to src/Resource/RecurringPayment/v3/CancelCharge.php
index 610b927..99ba325 100644
--- a/src/Resource/RecurringPayment/CancelCharge.php
+++ b/src/Resource/RecurringPayment/v3/CancelCharge.php
@@ -1,13 +1,9 @@
 <?php
 
-namespace zaporylie\Vipps\Resource\RecurringPayment;
+namespace zaporylie\Vipps\Resource\RecurringPayment\v3;
 
-use zaporylie\Vipps\Model\RecurringPayment\RequestCreateCharge;
-use zaporylie\Vipps\Model\RecurringPayment\ResponseCaptureCharge;
-use zaporylie\Vipps\Model\RecurringPayment\ResponseCreateCharge;
 use zaporylie\Vipps\Resource\HttpMethod;
 use zaporylie\Vipps\Resource\IdempotencyKeyFactory;
-use zaporylie\Vipps\Resource\RequestIdFactory;
 use zaporylie\Vipps\VippsInterface;
 
 /**
diff --git a/src/Resource/RecurringPayment/CaptureCharge.php b/src/Resource/RecurringPayment/v3/CaptureCharge.php
similarity index 81%
rename from src/Resource/RecurringPayment/CaptureCharge.php
rename to src/Resource/RecurringPayment/v3/CaptureCharge.php
index cdc536b..97057bc 100644
--- a/src/Resource/RecurringPayment/CaptureCharge.php
+++ b/src/Resource/RecurringPayment/v3/CaptureCharge.php
@@ -1,13 +1,9 @@
 <?php
 
-namespace zaporylie\Vipps\Resource\RecurringPayment;
+namespace zaporylie\Vipps\Resource\RecurringPayment\v3;
 
-use zaporylie\Vipps\Model\RecurringPayment\RequestCreateCharge;
-use zaporylie\Vipps\Model\RecurringPayment\ResponseCaptureCharge;
-use zaporylie\Vipps\Model\RecurringPayment\ResponseCreateCharge;
 use zaporylie\Vipps\Resource\HttpMethod;
 use zaporylie\Vipps\Resource\IdempotencyKeyFactory;
-use zaporylie\Vipps\Resource\RequestIdFactory;
 use zaporylie\Vipps\VippsInterface;
 
 /**
diff --git a/src/Resource/RecurringPayment/CreateAgreement.php b/src/Resource/RecurringPayment/v3/CreateAgreement.php
similarity index 75%
rename from src/Resource/RecurringPayment/CreateAgreement.php
rename to src/Resource/RecurringPayment/v3/CreateAgreement.php
index dace64e..2739c45 100644
--- a/src/Resource/RecurringPayment/CreateAgreement.php
+++ b/src/Resource/RecurringPayment/v3/CreateAgreement.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace zaporylie\Vipps\Resource\RecurringPayment;
+namespace zaporylie\Vipps\Resource\RecurringPayment\v3;
 
-use zaporylie\Vipps\Model\RecurringPayment\RequestCreateAgreement;
-use zaporylie\Vipps\Model\RecurringPayment\ResponseCreateAgreement;
+use zaporylie\Vipps\Model\RecurringPayment\v3\RequestCreateAgreement;
+use zaporylie\Vipps\Model\RecurringPayment\v3\ResponseCreateAgreement;
 use zaporylie\Vipps\Resource\HttpMethod;
 use zaporylie\Vipps\Resource\IdempotencyKeyFactory;
 use zaporylie\Vipps\VippsInterface;
@@ -31,7 +31,7 @@ class CreateAgreement extends RecurringPaymentResourceBase
      *
      * @param \zaporylie\Vipps\VippsInterface $vipps
      * @param string $subscription_key
-     * @param \zaporylie\Vipps\Model\RecurringPayment\RequestCreateAgreement $requestObject
+     * @param \zaporylie\Vipps\Model\RecurringPayment\v3\RequestCreateAgreement $requestObject
      */
     public function __construct(VippsInterface $vipps, $subscription_key, RequestCreateAgreement $requestObject)
     {
@@ -47,13 +47,13 @@ public function __construct(VippsInterface $vipps, $subscription_key, RequestCre
     }
 
     /**
-     * @return \zaporylie\Vipps\Model\RecurringPayment\ResponseCreateAgreement
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\ResponseCreateAgreement
      */
     public function call()
     {
         $response = $this->makeCall();
         $body = $response->getBody()->getContents();
-        /** @var \zaporylie\Vipps\Model\RecurringPayment\ResponseCreateAgreement $responseObject */
+        /** @var \zaporylie\Vipps\Model\RecurringPayment\v3\ResponseCreateAgreement $responseObject */
         $responseObject = $this
             ->getSerializer()
             ->deserialize(
diff --git a/src/Resource/RecurringPayment/CreateCharge.php b/src/Resource/RecurringPayment/v3/CreateCharge.php
similarity index 76%
rename from src/Resource/RecurringPayment/CreateCharge.php
rename to src/Resource/RecurringPayment/v3/CreateCharge.php
index 377dba3..1675a14 100644
--- a/src/Resource/RecurringPayment/CreateCharge.php
+++ b/src/Resource/RecurringPayment/v3/CreateCharge.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace zaporylie\Vipps\Resource\RecurringPayment;
+namespace zaporylie\Vipps\Resource\RecurringPayment\v3;
 
-use zaporylie\Vipps\Model\RecurringPayment\RequestCreateCharge;
-use zaporylie\Vipps\Model\RecurringPayment\ResponseCreateCharge;
+use zaporylie\Vipps\Model\RecurringPayment\v3\RequestCreateCharge;
+use zaporylie\Vipps\Model\RecurringPayment\v3\ResponseCreateCharge;
 use zaporylie\Vipps\Resource\HttpMethod;
 use zaporylie\Vipps\Resource\IdempotencyKeyFactory;
-use zaporylie\Vipps\Resource\RequestIdFactory;
 use zaporylie\Vipps\VippsInterface;
 
 /**
@@ -33,7 +32,7 @@ class CreateCharge extends RecurringPaymentResourceBase
      * @param \zaporylie\Vipps\VippsInterface $vipps
      * @param string $subscription_key
      * @param string $agreementId
-     * @param \zaporylie\Vipps\Model\RecurringPayment\RequestCreateCharge $requestObject
+     * @param \zaporylie\Vipps\Model\RecurringPayment\v3\RequestCreateCharge $requestObject
      */
     public function __construct(
         VippsInterface $vipps,
@@ -54,13 +53,13 @@ public function __construct(
     }
 
     /**
-     * @return \zaporylie\Vipps\Model\RecurringPayment\ResponseCreateCharge
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\ResponseCreateCharge
      */
     public function call()
     {
         $response = $this->makeCall();
         $body = $response->getBody()->getContents();
-        /** @var \zaporylie\Vipps\Model\RecurringPayment\ResponseCreateCharge $responseObject */
+        /** @var \zaporylie\Vipps\Model\RecurringPayment\v3\ResponseCreateCharge $responseObject */
         $responseObject = $this
             ->getSerializer()
             ->deserialize(
diff --git a/src/Resource/RecurringPayment/GetAgreement.php b/src/Resource/RecurringPayment/v3/GetAgreement.php
similarity index 79%
rename from src/Resource/RecurringPayment/GetAgreement.php
rename to src/Resource/RecurringPayment/v3/GetAgreement.php
index 30f5079..06f42a7 100644
--- a/src/Resource/RecurringPayment/GetAgreement.php
+++ b/src/Resource/RecurringPayment/v3/GetAgreement.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace zaporylie\Vipps\Resource\RecurringPayment;
+namespace zaporylie\Vipps\Resource\RecurringPayment\v3;
 
-use zaporylie\Vipps\Model\RecurringPayment\ResponseGetAgreement;
+use zaporylie\Vipps\Model\RecurringPayment\v3\ResponseGetAgreement;
 use zaporylie\Vipps\Resource\HttpMethod;
 use zaporylie\Vipps\VippsInterface;
 
@@ -38,13 +38,13 @@ public function __construct(VippsInterface $vipps, $subscription_key, $agreement
     }
 
     /**
-     * @return \zaporylie\Vipps\Model\RecurringPayment\ResponseGetAgreement
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\ResponseGetAgreement
      */
     public function call()
     {
         $response = $this->makeCall();
         $body = $response->getBody()->getContents();
-        /** @var \zaporylie\Vipps\Model\RecurringPayment\ResponseGetAgreement $responseObject */
+        /** @var \zaporylie\Vipps\Model\RecurringPayment\v3\ResponseGetAgreement $responseObject */
         $responseObject = $this
             ->getSerializer()
             ->deserialize(
diff --git a/src/Resource/RecurringPayment/GetAgreements.php b/src/Resource/RecurringPayment/v3/GetAgreements.php
similarity index 71%
rename from src/Resource/RecurringPayment/GetAgreements.php
rename to src/Resource/RecurringPayment/v3/GetAgreements.php
index 622d3d0..7447685 100644
--- a/src/Resource/RecurringPayment/GetAgreements.php
+++ b/src/Resource/RecurringPayment/v3/GetAgreements.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace zaporylie\Vipps\Resource\RecurringPayment;
+namespace zaporylie\Vipps\Resource\RecurringPayment\v3;
 
-use zaporylie\Vipps\Model\RecurringPayment\ResponseGetAgreement;
+use zaporylie\Vipps\Model\RecurringPayment\v3\ResponseGetAgreement;
 use zaporylie\Vipps\Resource\HttpMethod;
 
 /**
@@ -24,13 +24,13 @@ class GetAgreements extends RecurringPaymentResourceBase
     protected $path = '/recurring/v3/agreements';
 
     /**
-     * @return \zaporylie\Vipps\Model\RecurringPayment\ResponseGetAgreement[]
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\ResponseGetAgreement[]
      */
     public function call()
     {
         $response = $this->makeCall();
         $body = $response->getBody()->getContents();
-        /** @var \zaporylie\Vipps\Model\RecurringPayment\ResponseGetAgreement[] $responseObject */
+        /** @var \zaporylie\Vipps\Model\RecurringPayment\v3\ResponseGetAgreement[] $responseObject */
         $responseObject = $this
             ->getSerializer()
             ->deserialize(
diff --git a/src/Resource/RecurringPayment/GetCharge.php b/src/Resource/RecurringPayment/v3/GetCharge.php
similarity index 80%
rename from src/Resource/RecurringPayment/GetCharge.php
rename to src/Resource/RecurringPayment/v3/GetCharge.php
index 9df81e7..da9abff 100644
--- a/src/Resource/RecurringPayment/GetCharge.php
+++ b/src/Resource/RecurringPayment/v3/GetCharge.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace zaporylie\Vipps\Resource\RecurringPayment;
+namespace zaporylie\Vipps\Resource\RecurringPayment\v3;
 
-use zaporylie\Vipps\Model\RecurringPayment\Charge;
+use zaporylie\Vipps\Model\RecurringPayment\v3\Charge;
 use zaporylie\Vipps\Resource\HttpMethod;
 
 /**
@@ -35,13 +35,13 @@ public function __construct(
     }
 
     /**
-     * @return \zaporylie\Vipps\Model\RecurringPayment\Charge
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\Charge
      */
     public function call()
     {
         $response = $this->makeCall();
         $body = $response->getBody()->getContents();
-        /** @var \zaporylie\Vipps\Model\RecurringPayment\Charge $responseObject */
+        /** @var \zaporylie\Vipps\Model\RecurringPayment\v3\Charge $responseObject */
         $responseObject = $this
             ->getSerializer()
             ->deserialize(
diff --git a/src/Resource/RecurringPayment/GetCharges.php b/src/Resource/RecurringPayment/v3/GetCharges.php
similarity index 79%
rename from src/Resource/RecurringPayment/GetCharges.php
rename to src/Resource/RecurringPayment/v3/GetCharges.php
index 210f87a..74dffcc 100644
--- a/src/Resource/RecurringPayment/GetCharges.php
+++ b/src/Resource/RecurringPayment/v3/GetCharges.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace zaporylie\Vipps\Resource\RecurringPayment;
+namespace zaporylie\Vipps\Resource\RecurringPayment\v3;
 
-use zaporylie\Vipps\Model\RecurringPayment\Charge;
+use zaporylie\Vipps\Model\RecurringPayment\v3\Charge;
 use zaporylie\Vipps\Resource\HttpMethod;
 
 /**
@@ -33,13 +33,13 @@ public function __construct(
     }
 
     /**
-     * @return \zaporylie\Vipps\Model\RecurringPayment\Charge[]
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\Charge[]
      */
     public function call()
     {
         $response = $this->makeCall();
         $body = $response->getBody()->getContents();
-        /** @var \zaporylie\Vipps\Model\RecurringPayment\Charge[] $responseObject */
+        /** @var \zaporylie\Vipps\Model\RecurringPayment\v3\Charge[] $responseObject */
         $responseObject = $this
             ->getSerializer()
             ->deserialize(
diff --git a/src/Resource/RecurringPayment/RecurringPaymentResourceBase.php b/src/Resource/RecurringPayment/v3/RecurringPaymentResourceBase.php
similarity index 96%
rename from src/Resource/RecurringPayment/RecurringPaymentResourceBase.php
rename to src/Resource/RecurringPayment/v3/RecurringPaymentResourceBase.php
index 7af5980..8ab403f 100644
--- a/src/Resource/RecurringPayment/RecurringPaymentResourceBase.php
+++ b/src/Resource/RecurringPayment/v3/RecurringPaymentResourceBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace zaporylie\Vipps\Resource\RecurringPayment;
+namespace zaporylie\Vipps\Resource\RecurringPayment\v3;
 
 use JMS\Serializer\Naming\IdenticalPropertyNamingStrategy;
 use JMS\Serializer\Naming\SerializedNameAnnotationStrategy;
diff --git a/src/Resource/RecurringPayment/RefundCharge.php b/src/Resource/RecurringPayment/v3/RefundCharge.php
similarity index 77%
rename from src/Resource/RecurringPayment/RefundCharge.php
rename to src/Resource/RecurringPayment/v3/RefundCharge.php
index 4c64d94..fe95a2a 100644
--- a/src/Resource/RecurringPayment/RefundCharge.php
+++ b/src/Resource/RecurringPayment/v3/RefundCharge.php
@@ -1,14 +1,10 @@
 <?php
 
-namespace zaporylie\Vipps\Resource\RecurringPayment;
+namespace zaporylie\Vipps\Resource\RecurringPayment\v3;
 
-use zaporylie\Vipps\Model\RecurringPayment\RequestCreateCharge;
-use zaporylie\Vipps\Model\RecurringPayment\RequestRefundCharge;
-use zaporylie\Vipps\Model\RecurringPayment\ResponseCaptureCharge;
-use zaporylie\Vipps\Model\RecurringPayment\ResponseCreateCharge;
+use zaporylie\Vipps\Model\RecurringPayment\v3\RequestRefundCharge;
 use zaporylie\Vipps\Resource\HttpMethod;
 use zaporylie\Vipps\Resource\IdempotencyKeyFactory;
-use zaporylie\Vipps\Resource\RequestIdFactory;
 use zaporylie\Vipps\VippsInterface;
 
 /**
@@ -36,7 +32,7 @@ class RefundCharge extends RecurringPaymentResourceBase
      * @param string $subscription_key
      * @param string $agreement_id
      * @param string $charge_id
-     * @param \zaporylie\Vipps\Model\RecurringPayment\RequestRefundCharge $requestObject
+     * @param \zaporylie\Vipps\Model\RecurringPayment\v3\RequestRefundCharge $requestObject
      */
     public function __construct(
         VippsInterface $vipps,
diff --git a/src/Resource/RecurringPayment/UpdateAgreement.php b/src/Resource/RecurringPayment/v3/UpdateAgreement.php
similarity index 79%
rename from src/Resource/RecurringPayment/UpdateAgreement.php
rename to src/Resource/RecurringPayment/v3/UpdateAgreement.php
index 65a8145..b304f2b 100644
--- a/src/Resource/RecurringPayment/UpdateAgreement.php
+++ b/src/Resource/RecurringPayment/v3/UpdateAgreement.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace zaporylie\Vipps\Resource\RecurringPayment;
+namespace zaporylie\Vipps\Resource\RecurringPayment\v3;
 
-use zaporylie\Vipps\Model\RecurringPayment\RequestUpdateAgreement;
-use zaporylie\Vipps\Model\RecurringPayment\ResponseUpdateAgreement;
+use zaporylie\Vipps\Model\RecurringPayment\v3\RequestUpdateAgreement;
 use zaporylie\Vipps\Resource\HttpMethod;
 use zaporylie\Vipps\Resource\IdempotencyKeyFactory;
 use zaporylie\Vipps\VippsInterface;
@@ -32,7 +31,7 @@ class UpdateAgreement extends RecurringPaymentResourceBase
      * @param \zaporylie\Vipps\VippsInterface $vipps
      * @param string $subscription_key
      * @param $agreement_id
-     * @param \zaporylie\Vipps\Model\RecurringPayment\RequestUpdateAgreement $requestObject
+     * @param \zaporylie\Vipps\Model\RecurringPayment\v3\RequestUpdateAgreement $requestObject
      */
     public function __construct(
         VippsInterface $vipps,
@@ -53,7 +52,7 @@ public function __construct(
     }
 
     /**
-     * @return \zaporylie\Vipps\Model\RecurringPayment\ResponseUpdateAgreement
+     * @return \zaporylie\Vipps\Model\RecurringPayment\v3\ResponseUpdateAgreement
      */
     public function call()
     {
diff --git a/test/Integration/Api/RecurringPaymentsTest.php b/test/Integration/Api/RecurringPaymentsTest.php
index 0bd3d74..30798bf 100644
--- a/test/Integration/Api/RecurringPaymentsTest.php
+++ b/test/Integration/Api/RecurringPaymentsTest.php
@@ -3,13 +3,13 @@
 namespace zaporylie\Vipps\Tests\Integration\Api;
 
 use zaporylie\Vipps\Exceptions\VippsException;
-use zaporylie\Vipps\Model\RecurringPayment\InitialCharge;
-use zaporylie\Vipps\Model\RecurringPayment\Interval;
-use zaporylie\Vipps\Model\RecurringPayment\RequestCreateAgreement;
-use zaporylie\Vipps\Model\RecurringPayment\RequestCreateCharge;
-use zaporylie\Vipps\Model\RecurringPayment\RequestRefundCharge;
-use zaporylie\Vipps\Model\RecurringPayment\Status;
-use zaporylie\Vipps\Model\RecurringPayment\TransactionType;
+use zaporylie\Vipps\Model\RecurringPayment\v3\InitialCharge;
+use zaporylie\Vipps\Model\RecurringPayment\v3\Interval;
+use zaporylie\Vipps\Model\RecurringPayment\v3\RequestCreateAgreement;
+use zaporylie\Vipps\Model\RecurringPayment\v3\RequestCreateCharge;
+use zaporylie\Vipps\Model\RecurringPayment\v3\RequestRefundCharge;
+use zaporylie\Vipps\Model\RecurringPayment\v3\Status;
+use zaporylie\Vipps\Model\RecurringPayment\v3\TransactionType;
 use zaporylie\Vipps\Tests\Integration\IntegrationTestBase;
 
 /**
@@ -26,7 +26,7 @@ class RecurringPaymentsTest extends IntegrationTestBase
     protected $merchantSerialNumber = 'test_merchant_serial_number';
 
     /**
-     * @var \zaporylie\Vipps\Api\RecurringPaymentInterface
+     * @var \zaporylie\Vipps\Api\v3\RecurringPaymentInterface
      */
     protected $api;
 
@@ -40,7 +40,7 @@ protected function setUp() : void
     }
 
     /**
-     * @covers \zaporylie\Vipps\Api\RecurringPayment::createAgreement()
+     * @covers \zaporylie\Vipps\Api\v3\RecurringPayment::createAgreement()
      */
     public function testValidCreateAgreement()
     {
@@ -80,7 +80,7 @@ public function testValidCreateAgreement()
     }
 
     /**
-     * @covers \zaporylie\Vipps\Api\RecurringPayment::createAgreement()
+     * @covers \zaporylie\Vipps\Api\v3\RecurringPayment::createAgreement()
      */
     public function testInvalidCreateAgreement()
     {
@@ -90,7 +90,7 @@ public function testInvalidCreateAgreement()
     }
 
     /**
-     * @covers \zaporylie\Vipps\Api\RecurringPayment::createCharge()
+     * @covers \zaporylie\Vipps\Api\v3\RecurringPayment::createCharge()
      */
     public function testValidCreateCharge()
     {
@@ -115,7 +115,7 @@ public function testValidCreateCharge()
     }
 
     /**
-     * @covers \zaporylie\Vipps\Api\RecurringPayment::cancelCharge()
+     * @covers \zaporylie\Vipps\Api\v3\RecurringPayment::cancelCharge()
      */
     public function testValidCancelCharge()
     {
@@ -134,7 +134,7 @@ public function testValidCancelCharge()
     }
 
     /**
-     * @covers \zaporylie\Vipps\Api\RecurringPayment::refundCharge()
+     * @covers \zaporylie\Vipps\Api\v3\RecurringPayment::refundCharge()
      */
     public function testValidRefundCharge()
     {
@@ -156,7 +156,7 @@ public function testValidRefundCharge()
     }
 
     /**
-     * @covers \zaporylie\Vipps\Api\RecurringPayment::getAgreement()
+     * @covers \zaporylie\Vipps\Api\v3\RecurringPayment::getAgreement()
      */
     public function testValidGetAgreement()
     {
@@ -208,7 +208,7 @@ public function testValidGetAgreement()
     }
 
     /**
-     * @covers \zaporylie\Vipps\Api\RecurringPayment::getCharge()
+     * @covers \zaporylie\Vipps\Api\v3\RecurringPayment::getCharge()
      */
     public function testValidGetCharge()
     {