From d02e1a7124a9280d523bec9fa72b9cb799f6113c Mon Sep 17 00:00:00 2001
From: Stepan Kosatyi <stepan@kosatyi.com>
Date: Mon, 12 Sep 2016 18:49:02 +0300
Subject: [PATCH 1/4] clear empty params in getSignature method

---
 Ipsp/Resource.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Ipsp/Resource.php b/Ipsp/Resource.php
index 10c0d70..09b872c 100644
--- a/Ipsp/Resource.php
+++ b/Ipsp/Resource.php
@@ -30,7 +30,7 @@ class Ipsp_Resource {
      * @return string
      */
     private function getSignature(Array $params){
-        $params = array_filter($params);
+        $params = array_filter($params,'strlen');
         ksort($params);
         $params = array_values($params);
         array_unshift( $params , $this->client->getPassword() );

From 58be9a8c1fab10c31cc975ec92e9a01169f8edde Mon Sep 17 00:00:00 2001
From: Stepan Kosatyi <stepan@kosatyi.com>
Date: Mon, 12 Sep 2016 18:50:03 +0300
Subject: [PATCH 2/4] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ddcf694..c05eb58 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ $ipsp   = new Ipsp_Api( $client );
 <?php
 function getSignature( $merchant_id , $password , $params = array() ){
  $params['merchant_id'] = $merchant_id;
- $params = array_filter($params);
+ $params = array_filter($params,'strlen');
  ksort($params);
  $params = array_values($params);
  array_unshift( $params , $password );

From 2fa708b7dac9192e9db5bb431ff2c7563023fe97 Mon Sep 17 00:00:00 2001
From: dmiroshnikov <dmmatrix222@gmail.com>
Date: Wed, 22 Mar 2017 11:42:50 +0200
Subject: [PATCH 3/4] fix unsupported php tags

---
 Ipsp/Client.php                 | 1 +
 Ipsp/Curl.php                   | 2 +-
 Ipsp/Resource.php               | 1 +
 Ipsp/Resource/Capture.php       | 2 +-
 Ipsp/Resource/Checkout.php      | 2 +-
 Ipsp/Resource/P2pcredit.php     | 2 +-
 Ipsp/Resource/Pcidss.php        | 2 +-
 Ipsp/Resource/PcidssConfirm.php | 2 +-
 Ipsp/Resource/Recurring.php     | 2 +-
 Ipsp/Resource/Reports.php       | 2 +-
 Ipsp/Resource/Result.php        | 2 +-
 Ipsp/Resource/Reverse.php       | 2 +-
 Ipsp/Resource/Status.php        | 2 +-
 Ipsp/Resource/Verification.php  | 2 +-
 14 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Ipsp/Client.php b/Ipsp/Client.php
index c02dda7..4586948 100644
--- a/Ipsp/Client.php
+++ b/Ipsp/Client.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Class PaymentClient
  */
diff --git a/Ipsp/Curl.php b/Ipsp/Curl.php
index c74fcc4..a61b295 100644
--- a/Ipsp/Curl.php
+++ b/Ipsp/Curl.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /**
  * Class Ipsp_Curl
diff --git a/Ipsp/Resource.php b/Ipsp/Resource.php
index 09b872c..0803ba1 100644
--- a/Ipsp/Resource.php
+++ b/Ipsp/Resource.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Class Ipsp_Resource
  */
diff --git a/Ipsp/Resource/Capture.php b/Ipsp/Resource/Capture.php
index c1f9113..2ff9ebd 100644
--- a/Ipsp/Resource/Capture.php
+++ b/Ipsp/Resource/Capture.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /**
  * Class Ipsp_Resource_PaymentResult
diff --git a/Ipsp/Resource/Checkout.php b/Ipsp/Resource/Checkout.php
index f7c3180..ba0363d 100644
--- a/Ipsp/Resource/Checkout.php
+++ b/Ipsp/Resource/Checkout.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /**
  * Class Ipsp_Resource_PaymentUrl
diff --git a/Ipsp/Resource/P2pcredit.php b/Ipsp/Resource/P2pcredit.php
index 8227d55..f990cc5 100644
--- a/Ipsp/Resource/P2pcredit.php
+++ b/Ipsp/Resource/P2pcredit.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /**
  * Class Ipsp_Resource_Refund
diff --git a/Ipsp/Resource/Pcidss.php b/Ipsp/Resource/Pcidss.php
index f01a969..259301c 100644
--- a/Ipsp/Resource/Pcidss.php
+++ b/Ipsp/Resource/Pcidss.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /**
  * Class Ipsp_Resource_PaymentPcidss
diff --git a/Ipsp/Resource/PcidssConfirm.php b/Ipsp/Resource/PcidssConfirm.php
index 0aeb9db..bd2e224 100644
--- a/Ipsp/Resource/PcidssConfirm.php
+++ b/Ipsp/Resource/PcidssConfirm.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /**
  * Class Ipsp_Resource_PaymentPcidss
diff --git a/Ipsp/Resource/Recurring.php b/Ipsp/Resource/Recurring.php
index 2981670..19e1859 100644
--- a/Ipsp/Resource/Recurring.php
+++ b/Ipsp/Resource/Recurring.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /**
  * Class Ipsp_Resource_Refund
diff --git a/Ipsp/Resource/Reports.php b/Ipsp/Resource/Reports.php
index 8d283f3..369f341 100644
--- a/Ipsp/Resource/Reports.php
+++ b/Ipsp/Resource/Reports.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /**
  * Class Ipsp_Resource_Refund
diff --git a/Ipsp/Resource/Result.php b/Ipsp/Resource/Result.php
index c90790c..b070283 100644
--- a/Ipsp/Resource/Result.php
+++ b/Ipsp/Resource/Result.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /**
  * Class Ipsp_Resource_PaymentResult
diff --git a/Ipsp/Resource/Reverse.php b/Ipsp/Resource/Reverse.php
index 90c18e7..21b9f7c 100644
--- a/Ipsp/Resource/Reverse.php
+++ b/Ipsp/Resource/Reverse.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /**
  * Class Ipsp_Resource_Refund
diff --git a/Ipsp/Resource/Status.php b/Ipsp/Resource/Status.php
index b342ca5..285b9d9 100644
--- a/Ipsp/Resource/Status.php
+++ b/Ipsp/Resource/Status.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /**
  * Class Ipsp_Resource_PaymentStatus
diff --git a/Ipsp/Resource/Verification.php b/Ipsp/Resource/Verification.php
index f229004..eb0a9f3 100644
--- a/Ipsp/Resource/Verification.php
+++ b/Ipsp/Resource/Verification.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 /**
  * Class Ipsp_Resource_Refund

From 737c8756848f1c0c0279d03dabc45d9ab39242e8 Mon Sep 17 00:00:00 2001
From: Alexey Berezuev <ko3blpbok@bk.ru>
Date: Sat, 17 Jun 2017 06:36:49 +0300
Subject: [PATCH 4/4] PSR4

---
 .gitignore                               |  2 +
 Ipsp/Error.php                           |  6 ---
 autoload.php                             | 11 -----
 composer.json                            | 15 ++++++
 init.example.php                         |  9 ++--
 {Ipsp => src}/Api.php                    | 20 ++++----
 {Ipsp => src}/Client.php                 |  4 +-
 {Ipsp => src}/Curl.php                   |  6 ++-
 src/Error.php                            |  8 ++++
 {Ipsp => src}/Request.php                |  8 ++--
 {Ipsp => src}/Resource.php               | 18 +++----
 {Ipsp => src}/Resource/Capture.php       |  9 +++-
 {Ipsp => src}/Resource/Checkout.php      |  9 +++-
 {Ipsp => src}/Resource/P2pcredit.php     |  8 +++-
 {Ipsp => src}/Resource/Pcidss.php        |  8 +++-
 {Ipsp => src}/Resource/PcidssConfirm.php |  8 +++-
 {Ipsp => src}/Resource/Recurring.php     |  8 +++-
 {Ipsp => src}/Resource/Reports.php       |  8 +++-
 {Ipsp => src}/Resource/Result.php        |  9 +++-
 {Ipsp => src}/Resource/Reverse.php       | 10 ++--
 {Ipsp => src}/Resource/Status.php        |  9 +++-
 {Ipsp => src}/Resource/Verification.php  |  9 +++-
 src/Resources/Capture.php                | 35 ++++++++++++++
 src/Resources/Checkout.php               | 42 +++++++++++++++++
 src/Resources/P2pcredit.php              | 53 +++++++++++++++++++++
 src/Resources/Pcidss.php                 | 60 ++++++++++++++++++++++++
 src/Resources/PcidssConfirm.php          | 39 +++++++++++++++
 src/Resources/Recurring.php              | 46 ++++++++++++++++++
 src/Resources/Reports.php                | 37 +++++++++++++++
 src/Resources/Result.php                 | 33 +++++++++++++
 src/Resources/Reverse.php                | 41 ++++++++++++++++
 src/Resources/Status.php                 | 31 ++++++++++++
 src/Resources/Verification.php           | 52 ++++++++++++++++++++
 {Ipsp => src}/Response.php               |  6 ++-
 {Ipsp => src}/XmlData.php                |  4 +-
 35 files changed, 612 insertions(+), 69 deletions(-)
 delete mode 100644 Ipsp/Error.php
 delete mode 100644 autoload.php
 create mode 100644 composer.json
 rename {Ipsp => src}/Api.php (85%)
 rename {Ipsp => src}/Client.php (96%)
 rename {Ipsp => src}/Curl.php (99%)
 create mode 100644 src/Error.php
 rename {Ipsp => src}/Request.php (95%)
 rename {Ipsp => src}/Resource.php (94%)
 rename {Ipsp => src}/Resource/Capture.php (85%)
 rename {Ipsp => src}/Resource/Checkout.php (89%)
 rename {Ipsp => src}/Resource/P2pcredit.php (91%)
 rename {Ipsp => src}/Resource/Pcidss.php (93%)
 rename {Ipsp => src}/Resource/PcidssConfirm.php (86%)
 rename {Ipsp => src}/Resource/Recurring.php (89%)
 rename {Ipsp => src}/Resource/Reports.php (87%)
 rename {Ipsp => src}/Resource/Result.php (86%)
 rename {Ipsp => src}/Resource/Reverse.php (88%)
 rename {Ipsp => src}/Resource/Status.php (83%)
 rename {Ipsp => src}/Resource/Verification.php (91%)
 create mode 100644 src/Resources/Capture.php
 create mode 100644 src/Resources/Checkout.php
 create mode 100644 src/Resources/P2pcredit.php
 create mode 100644 src/Resources/Pcidss.php
 create mode 100644 src/Resources/PcidssConfirm.php
 create mode 100644 src/Resources/Recurring.php
 create mode 100644 src/Resources/Reports.php
 create mode 100644 src/Resources/Result.php
 create mode 100644 src/Resources/Reverse.php
 create mode 100644 src/Resources/Status.php
 create mode 100644 src/Resources/Verification.php
 rename {Ipsp => src}/Response.php (94%)
 rename {Ipsp => src}/XmlData.php (93%)

diff --git a/.gitignore b/.gitignore
index 9f11b75..b9991e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 .idea/
+
+/vendor/
diff --git a/Ipsp/Error.php b/Ipsp/Error.php
deleted file mode 100644
index fcb1ae0..0000000
--- a/Ipsp/Error.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-    class Ipsp_Error extends \Exception{
-
-
-    }
\ No newline at end of file
diff --git a/autoload.php b/autoload.php
deleted file mode 100644
index 6f5d429..0000000
--- a/autoload.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-function ipsp_autoload($className){
-    $classPath = explode('_',$className);
-    if($classPath[0]!='Ipsp') return;
-    $filePath = dirname(__FILE__).'/'.implode('/', $classPath).'.php';
-    if(file_exists($filePath))
-        require_once( $filePath );
-}
-
-spl_autoload_register('ipsp_autoload');
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..573f97f
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,15 @@
+{
+    "name": "cloudipsp/ipsp",
+    "description": "Payment service provider",
+    "type": "library",
+    "require": {
+        "php":">=5.4",
+        "ext-simplexml":"*",
+        "ext-curl": "*"
+    },
+    "autoload": {
+        "psr-4": {
+            "Ipsp\\": "src/"
+        }
+    }
+}
diff --git a/init.example.php b/init.example.php
index a54d486..ccb6990 100644
--- a/init.example.php
+++ b/init.example.php
@@ -1,7 +1,10 @@
 <?php
-require_once 'ipsp-php/autoload.php';
+use Ipsp\Api;
+use Ipsp\Client;
+
 define('MERCHANT_ID' , 1000);
 define('MERCHANT_PASSWORD' , 'test');
 define('IPSP_GATEWAY' ,  'api.fondy.eu');
-$client = new Ipsp_Client( MERCHANT_ID , MERCHANT_PASSWORD, IPSP_GATEWAY );
-$ipsp   = new Ipsp_Api( $client );
+
+$client = new Client( MERCHANT_ID , MERCHANT_PASSWORD, IPSP_GATEWAY );
+$ipsp   = new Api( $client );
diff --git a/Ipsp/Api.php b/src/Api.php
similarity index 85%
rename from Ipsp/Api.php
rename to src/Api.php
index 70f1673..50326bc 100644
--- a/Ipsp/Api.php
+++ b/src/Api.php
@@ -1,9 +1,11 @@
 <?php
 
+namespace Ipsp;
+
 /**
- * Class Ipsp_Api
+ * Class Api
  */
-class Ipsp_Api {
+class Api {
 
     private $client;
     private $params = array();
@@ -16,9 +18,9 @@ class Ipsp_Api {
     const RUB = 'RUB';
     const GBP = 'GBP';    
     /**
-     * @param Ipsp_Client $client
+     * @param Client $client
      */
-    public function __construct( Ipsp_Client $client ){
+    public function __construct( Client $client ){
         $this->client   = $client;
         set_error_handler(array($this, 'handleError'));
         set_exception_handler(array($this, 'handleException'));
@@ -28,10 +30,10 @@ public function __construct( Ipsp_Client $client ){
      * @return bool
      */
     public function initResource($name){
-        $class    = implode('_',array('Ipsp','Resource',ucfirst($name)));
-        if(!class_exists($class)) new \Exception(sprintf('ipsp resource "%s" not found',$class));
-        $resource = new $class;
-        return $resource;
+        $class    = '\Ipsp\Resources\\' . ucfirst($name);
+        if(!class_exists($class))
+            new \Exception(sprintf('"%s" not found',$class));
+        return new $class;
     }
     /**
      * @param null $name
@@ -91,4 +93,4 @@ public function handleException(\Exception $e) {
        );
        exit($msg);
     }
-}
+}
\ No newline at end of file
diff --git a/Ipsp/Client.php b/src/Client.php
similarity index 96%
rename from Ipsp/Client.php
rename to src/Client.php
index 4586948..0baea2b 100644
--- a/Ipsp/Client.php
+++ b/src/Client.php
@@ -1,9 +1,11 @@
 <?php
 
+namespace Ipsp;
+
 /**
  * Class PaymentClient
  */
-class Ipsp_Client {
+class Client {
     private $id;
     private $password;
     private $url;
diff --git a/Ipsp/Curl.php b/src/Curl.php
similarity index 99%
rename from Ipsp/Curl.php
rename to src/Curl.php
index a61b295..c5ccf7e 100644
--- a/Ipsp/Curl.php
+++ b/src/Curl.php
@@ -1,9 +1,11 @@
 <?php
 
+namespace Ipsp;
+
 /**
- * Class Ipsp_Curl
+ * Class Curl
  */
-class Ipsp_Curl {
+class Curl {
     protected $response = '';       // Contains the cURL response for debug
     protected $session;             // Contains the cURL handler for a session
     protected $url;                 // URL of the session
diff --git a/src/Error.php b/src/Error.php
new file mode 100644
index 0000000..6f6666c
--- /dev/null
+++ b/src/Error.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Ipsp;
+
+    class Error extends \Exception{
+
+
+    }
\ No newline at end of file
diff --git a/Ipsp/Request.php b/src/Request.php
similarity index 95%
rename from Ipsp/Request.php
rename to src/Request.php
index d24fb05..486f0ea 100644
--- a/Ipsp/Request.php
+++ b/src/Request.php
@@ -1,9 +1,11 @@
 <?php
 
+namespace Ipsp;
+
 /**
- * Class Ipsp_Request
+ * Class Request
  */
-class Ipsp_Request {
+class Request {
     private $curl;
     private $format;
     private $contentType = array(
@@ -15,7 +17,7 @@ class Ipsp_Request {
      *
      */
     public function __construct(){
-        $this->curl = new Ipsp_Curl;
+        $this->curl = new Curl;
     }
     /**
      * @param $format
diff --git a/Ipsp/Resource.php b/src/Resource.php
similarity index 94%
rename from Ipsp/Resource.php
rename to src/Resource.php
index 0803ba1..f3a237c 100644
--- a/Ipsp/Resource.php
+++ b/src/Resource.php
@@ -1,9 +1,11 @@
 <?php
 
+namespace Ipsp;
+
 /**
- * Class Ipsp_Resource
+ * Class Resource
  */
-class Ipsp_Resource {
+class Resource {
     protected $method = 'POST';
     protected $format = 'json';
     protected $path;
@@ -52,7 +54,7 @@ private function parseJson($json=''){
      * @return array
      */
     private function parseXml($xml=''){
-        $xml = new Ipsp_XmlData($xml);
+        $xml = new XmlData($xml);
         $data = $xml->xmlToArray();
         return $data;
     }
@@ -100,7 +102,7 @@ private function formParams($params=array()){
      * @return mixed
      */
     private function xmlParams($params=array()){
-        $xml = new Ipsp_XmlData('<request/>');
+        $xml = new XmlData('<request/>');
         $xml->arrayToXml($params);
         return $xml->asXML();
     }
@@ -119,14 +121,14 @@ protected function buildParams($params){
         }
     }
     public function __construct(){
-        $this->request  = new Ipsp_Request();
+        $this->request  = new Request();
         if(!empty($this->defaultParams))
             $this->params = $this->defaultParams;
     }
     /**
-     * @param Ipsp_Client $client
+     * @param Client $client
      */
-    public function setClient(Ipsp_Client $client){
+    public function setClient(Client $client){
         $this->client = $client;
     }
     /**
@@ -201,7 +203,7 @@ public function call( $params=array() ){
      * @param array $data
      */
     public function setResponse($data=array()){
-        $this->response = new Ipsp_Response($data);
+        $this->response = new Response($data);
     }
     /**
      * @return array
diff --git a/Ipsp/Resource/Capture.php b/src/Resource/Capture.php
similarity index 85%
rename from Ipsp/Resource/Capture.php
rename to src/Resource/Capture.php
index 2ff9ebd..ef7ae80 100644
--- a/Ipsp/Resource/Capture.php
+++ b/src/Resource/Capture.php
@@ -1,9 +1,14 @@
 <?php
 
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
+
 /**
- * Class Ipsp_Resource_PaymentResult
+ * Class PaymentResult
  */
-class Ipsp_Resource_Capture extends Ipsp_Resource{
+class Capture extends Resource
+{
     protected $path   = '/capture/order_id';
     protected $fields = array(
         'merchant_id'=>array(
diff --git a/Ipsp/Resource/Checkout.php b/src/Resource/Checkout.php
similarity index 89%
rename from Ipsp/Resource/Checkout.php
rename to src/Resource/Checkout.php
index ba0363d..40ffabb 100644
--- a/Ipsp/Resource/Checkout.php
+++ b/src/Resource/Checkout.php
@@ -1,9 +1,14 @@
 <?php
 
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
+
 /**
- * Class Ipsp_Resource_PaymentUrl
+ * Class PaymentUrl
  */
-class Ipsp_Resource_Checkout extends Ipsp_Resource{
+class Checkout extends Resource
+{
     protected $path   = '/checkout/url';
     protected $fields = array(
         'merchant_id'=>array(
diff --git a/Ipsp/Resource/P2pcredit.php b/src/Resource/P2pcredit.php
similarity index 91%
rename from Ipsp/Resource/P2pcredit.php
rename to src/Resource/P2pcredit.php
index f990cc5..96aebfa 100644
--- a/Ipsp/Resource/P2pcredit.php
+++ b/src/Resource/P2pcredit.php
@@ -1,9 +1,13 @@
 <?php
 
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
+
 /**
- * Class Ipsp_Resource_Refund
+ * Class Refund
  */
-class Ipsp_Resource_P2pcredit extends Ipsp_Resource{
+class P2pcredit extends Resource {
     protected $path   = '/p2pcredit';
     protected $defaultParams = array(
 
diff --git a/Ipsp/Resource/Pcidss.php b/src/Resource/Pcidss.php
similarity index 93%
rename from Ipsp/Resource/Pcidss.php
rename to src/Resource/Pcidss.php
index 259301c..864c94d 100644
--- a/Ipsp/Resource/Pcidss.php
+++ b/src/Resource/Pcidss.php
@@ -1,9 +1,13 @@
 <?php
 
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
+
 /**
- * Class Ipsp_Resource_PaymentPcidss
+ * Class PaymentPcidss
  */
-class Ipsp_Resource_Pcidss extends Ipsp_Resource
+class Pcidss extends Resource
 {
     protected $path = '/3dsecure_step1';
     protected $fields = array(
diff --git a/Ipsp/Resource/PcidssConfirm.php b/src/Resource/PcidssConfirm.php
similarity index 86%
rename from Ipsp/Resource/PcidssConfirm.php
rename to src/Resource/PcidssConfirm.php
index bd2e224..40fe749 100644
--- a/Ipsp/Resource/PcidssConfirm.php
+++ b/src/Resource/PcidssConfirm.php
@@ -1,9 +1,13 @@
 <?php
 
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
+
 /**
- * Class Ipsp_Resource_PaymentPcidss
+ * Class PaymentPcidss
  */
-class Ipsp_Resource_PcidssConfirm extends Ipsp_Resource
+class PcidssConfirm extends Resource
 {
     protected $path = '/3dsecure_step2';
     protected $fields = array(
diff --git a/Ipsp/Resource/Recurring.php b/src/Resource/Recurring.php
similarity index 89%
rename from Ipsp/Resource/Recurring.php
rename to src/Resource/Recurring.php
index 19e1859..d4213b7 100644
--- a/Ipsp/Resource/Recurring.php
+++ b/src/Resource/Recurring.php
@@ -1,9 +1,13 @@
 <?php
 
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
+
 /**
- * Class Ipsp_Resource_Refund
+ * Class Refund
  */
-class Ipsp_Resource_Recurring extends Ipsp_Resource{
+class Recurring extends Resource{
     protected $path   = '/recurring';
     protected $defaultParams = array(
 
diff --git a/Ipsp/Resource/Reports.php b/src/Resource/Reports.php
similarity index 87%
rename from Ipsp/Resource/Reports.php
rename to src/Resource/Reports.php
index 369f341..bf8045e 100644
--- a/Ipsp/Resource/Reports.php
+++ b/src/Resource/Reports.php
@@ -1,9 +1,13 @@
 <?php
 
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
+
 /**
- * Class Ipsp_Resource_Refund
+ * Class Refund
  */
-class Ipsp_Resource_Reports extends Ipsp_Resource{
+class Reports extends Resource{
     protected $path   = '/reports';
     protected $fields = array(
         'merchant_id'=>array(
diff --git a/Ipsp/Resource/Result.php b/src/Resource/Result.php
similarity index 86%
rename from Ipsp/Resource/Result.php
rename to src/Resource/Result.php
index b070283..18015fb 100644
--- a/Ipsp/Resource/Result.php
+++ b/src/Resource/Result.php
@@ -1,9 +1,14 @@
 <?php
 
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
+
 /**
- * Class Ipsp_Resource_PaymentResult
+ * Class PaymentResult
  */
-class Ipsp_Resource_Result extends Ipsp_Resource{
+class Result extends Resource
+{
     public function call( $data = NULL ){
         if( empty( $data ) )
         {
diff --git a/Ipsp/Resource/Reverse.php b/src/Resource/Reverse.php
similarity index 88%
rename from Ipsp/Resource/Reverse.php
rename to src/Resource/Reverse.php
index 21b9f7c..a773f9e 100644
--- a/Ipsp/Resource/Reverse.php
+++ b/src/Resource/Reverse.php
@@ -1,10 +1,14 @@
 <?php
 
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
+
 /**
- * Class Ipsp_Resource_Refund
+ * Class Refund
  */
-class Ipsp_Resource_Reverse extends Ipsp_Resource{
-
+class Reverse extends Resource
+{
     protected $path   = '/reverse/order_id';
 
     protected $fields = array(
diff --git a/Ipsp/Resource/Status.php b/src/Resource/Status.php
similarity index 83%
rename from Ipsp/Resource/Status.php
rename to src/Resource/Status.php
index 285b9d9..30d21f4 100644
--- a/Ipsp/Resource/Status.php
+++ b/src/Resource/Status.php
@@ -1,9 +1,14 @@
 <?php
 
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
+
 /**
- * Class Ipsp_Resource_PaymentStatus
+ * Class PaymentStatus
  */
-class Ipsp_Resource_Status extends Ipsp_Resource{
+class Status extends Resource
+{
     protected $path   = '/status/order_id';
     protected $fields = array(
         'order_id'=>array(
diff --git a/Ipsp/Resource/Verification.php b/src/Resource/Verification.php
similarity index 91%
rename from Ipsp/Resource/Verification.php
rename to src/Resource/Verification.php
index eb0a9f3..f4e7a24 100644
--- a/Ipsp/Resource/Verification.php
+++ b/src/Resource/Verification.php
@@ -1,9 +1,14 @@
 <?php
 
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
+
 /**
- * Class Ipsp_Resource_Refund
+ * Class Refund
  */
-class Ipsp_Resource_Verification extends Ipsp_Resource{
+class Verification extends Resource
+{
     protected $path   = '/checkout/url';
     protected $defaultParams = array(
         'verification'=>'y',
diff --git a/src/Resources/Capture.php b/src/Resources/Capture.php
new file mode 100644
index 0000000..511405e
--- /dev/null
+++ b/src/Resources/Capture.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Ipsp\Resources;
+
+use Ipsp\Resource;
+
+/**
+ * Class PaymentResult
+ */
+class Capture extends Resource
+{
+    protected $path   = '/capture/order_id';
+    protected $fields = array(
+        'merchant_id'=>array(
+            'type'    => 'string',
+            'required'=>TRUE
+        ),
+        'order_id'=>array(
+            'type'    => 'string',
+            'required'=>TRUE
+        ),
+        'currency' => array(
+            'type' => 'string',
+            'required'=>TRUE
+        ),
+        'amount' => array(
+            'type' => 'integer',
+            'required'=>TRUE
+        ),
+        'signature' => array(
+            'type' => 'string',
+            'required'=>TRUE
+        )
+    );
+}
\ No newline at end of file
diff --git a/src/Resources/Checkout.php b/src/Resources/Checkout.php
new file mode 100644
index 0000000..9637f24
--- /dev/null
+++ b/src/Resources/Checkout.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Ipsp\Resources;
+
+use Ipsp\Resource;
+
+/**
+ * Class PaymentUrl
+ */
+class Checkout extends Resource
+{
+    protected $path   = '/checkout/url';
+    protected $fields = array(
+        'merchant_id'=>array(
+            'type'    => 'string',
+            'required'=>TRUE
+        ),
+        'order_id'=>array(
+            'type'    => 'string',
+            'required'=>TRUE
+        ),
+        'order_desc'=>array(
+            'type' => 'string',
+            'required'=>TRUE
+        ),
+        'currency' => array(
+            'type' => 'string',
+            'required'=>TRUE
+        ),
+        'amount' => array(
+            'type' => 'integer',
+            'required'=>TRUE
+        ),
+        'signature' => array(
+            'type' => 'string',
+            'required'=>TRUE
+        )
+    );
+    public function redirectToCheckout(){
+        $this->getResponse()->redirectTo('checkout_url');
+    }
+}
\ No newline at end of file
diff --git a/src/Resources/P2pcredit.php b/src/Resources/P2pcredit.php
new file mode 100644
index 0000000..d356709
--- /dev/null
+++ b/src/Resources/P2pcredit.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Ipsp\Resources;
+
+use Ipsp\Resource;
+
+/**
+ * Class Refund
+ */
+class P2pcredit extends Resource {
+    protected $path   = '/p2pcredit';
+    protected $defaultParams = array(
+
+    );
+    protected $fields = array(
+        'merchant_id'=>array(
+            'type'    => 'string',
+            'required'=>TRUE
+        ),
+        'order_id'=>array(
+            'type'    => 'string',
+            'required'=>TRUE
+        ),
+        'order_desc'=>array(
+            'type'    => 'string',
+            'required'=>TRUE
+        ),
+        'currency' => array(
+            'type' => 'string',
+            'required'=>TRUE
+        ),
+        'amount' => array(
+            'type' => 'integer',
+            'required'=>TRUE
+        ),
+        'receiver_card_number'=>array(
+            'type' => 'string',
+            'required'=>FALSE
+        ),
+        'receiver_rectoken'=>array(
+            'type' => 'string',
+            'required'=>FALSE
+        ),
+        'signature' => array(
+            'type' => 'string',
+            'required'=>TRUE
+        ),
+        'version' => array(
+            'type' => 'string',
+            'required'=>FALSE
+        )
+    );
+}
\ No newline at end of file
diff --git a/src/Resources/Pcidss.php b/src/Resources/Pcidss.php
new file mode 100644
index 0000000..2ffe5df
--- /dev/null
+++ b/src/Resources/Pcidss.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Ipsp\Resources;
+
+use Ipsp\Resource;
+
+/**
+ * Class PaymentPcidss
+ */
+class Pcidss extends Resource
+{
+    protected $path = '/3dsecure_step1';
+    protected $fields = array(
+        'order_id' => array(
+            'type' => 'string',
+            'required' => TRUE
+        ),
+        'order_desc' => array(
+            'type' => 'string',
+            'required' => TRUE
+        ),
+        'currency' => array(
+            'type' => 'string',
+            'required' => TRUE
+        ),
+        'amount' => array(
+            'type' => 'datetime',
+            'required' => TRUE
+        ),
+        'card_number' => array(
+            'type' => 'creditcard',
+            'required' => TRUE
+        ),
+        'cvv2' => array(
+            'type' => 'cvv',
+            'required' => TRUE
+        ),
+        'expiry_date' => array(
+            'type' => 'datetime',
+            'required' => TRUE
+        )
+    );
+
+    public function acsRedirect( ){
+        $response = $this->response;
+        if(!$response->acs_url) return FALSE;
+        $data = array(
+            'PaReq'   => $response->pareq,
+            'MD'      => $response->md,
+            'TermUrl' => $this->getParam('response_url')
+        );
+        $html = "<html><body><form id='form' action='$response->acs_url' method='post'>";
+        foreach ($data as $key => $value)
+            $html .= "<input type='hidden' name='$key' value='$value'>";
+        $html .= "</form><script>document.getElementById('form').submit();</script>";
+        $html .= "</body></html>";
+        exit($html);
+    }
+
+}
\ No newline at end of file
diff --git a/src/Resources/PcidssConfirm.php b/src/Resources/PcidssConfirm.php
new file mode 100644
index 0000000..500bbac
--- /dev/null
+++ b/src/Resources/PcidssConfirm.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Ipsp\Resources;
+
+use Ipsp\Resource;
+
+/**
+ * Class PaymentPcidss
+ */
+class PcidssConfirm extends Resource
+{
+    protected $path = '/3dsecure_step2';
+    protected $fields = array(
+        'order_id' => array(
+            'type' => 'string',
+            'required' => TRUE
+        ),
+        'merchant_id' => array(
+            'type' => 'string',
+            'required' => TRUE
+        ),
+        'pares' => array(
+            'type' => 'string',
+            'required' => TRUE
+        ),
+        'md' => array(
+            'type' => 'string',
+            'required' => TRUE
+        ),
+        'version' => array(
+            'type' => 'cvv',
+            'required' => FALSE
+        ),
+        'signature' => array(
+            'type' => 'string',
+            'required' => TRUE
+        )
+    );
+}
\ No newline at end of file
diff --git a/src/Resources/Recurring.php b/src/Resources/Recurring.php
new file mode 100644
index 0000000..f5cf2c1
--- /dev/null
+++ b/src/Resources/Recurring.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Ipsp\Resources;
+
+use Ipsp\Resource;
+
+/**
+ * Class Refund
+ */
+class Recurring extends Resource{
+    protected $path   = '/recurring';
+    protected $defaultParams = array(
+
+    );
+    protected $fields = array(
+        'merchant_id'=>array(
+            'type'    => 'string',
+            'required'=>TRUE
+        ),
+        'order_id'=>array(
+            'type'    => 'string',
+            'required'=>TRUE
+        ),
+        'currency' => array(
+            'type' => 'string',
+            'required'=>TRUE
+        ),
+        'amount' => array(
+            'type' => 'integer',
+            'required'=>TRUE
+        ),
+        'signature' => array(
+            'type' => 'string',
+            'required'=>TRUE
+        ),
+        'rectoken' => array(
+            'type' => 'string',
+            'required'=>TRUE
+        ),
+        'version' => array(
+            'type' => 'string',
+            'required'=>FALSE
+        )
+    );
+
+}
\ No newline at end of file
diff --git a/src/Resources/Reports.php b/src/Resources/Reports.php
new file mode 100644
index 0000000..35d9643
--- /dev/null
+++ b/src/Resources/Reports.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Ipsp\Resources;
+
+use Ipsp\Resource;
+
+/**
+ * Class Refund
+ */
+class Reports extends Resource{
+    protected $path   = '/reports';
+    protected $fields = array(
+        'merchant_id'=>array(
+            'type'    => 'string',
+            'required'=> TRUE
+        ),
+        'date_from'=>array(
+            'type'     => 'string',
+            'format'   => '',
+            'required' => TRUE
+        ),
+        'date_to' => array(
+            'type'    => 'string',
+            'format'  => '' ,
+            'required'=> TRUE
+        ),
+        'signature' => array(
+            'type' => 'string',
+            'required'=>TRUE
+        ),
+        'version' => array(
+            'type' => 'string',
+            'required'=>FALSE
+        )
+    );
+
+}
\ No newline at end of file
diff --git a/src/Resources/Result.php b/src/Resources/Result.php
new file mode 100644
index 0000000..df59233
--- /dev/null
+++ b/src/Resources/Result.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Ipsp\Resources;
+
+use Ipsp\Resource;
+
+/**
+ * Class PaymentResult
+ */
+class Result extends Resource
+{
+    public function call( $data = NULL ){
+        if( empty( $data ) )
+        {
+            $this->parseResponseData();
+        } else{
+            $this->setResponse($data);
+        }
+        return $this;
+    }
+    private function parseResponseData(){
+       $body = file_get_contents('php://input');
+       $types = $this->request->getContentTypes();
+       $types = array_flip($types);
+       $type = explode(';',$_SERVER['CONTENT_TYPE']);
+       $type = trim($type[0]);
+       if(isset($types[$type])){
+           $this->format = $types[$type];
+           $data = $this->parseRespose($body);
+           $this->setResponse($data);
+       }
+    }
+}
\ No newline at end of file
diff --git a/src/Resources/Reverse.php b/src/Resources/Reverse.php
new file mode 100644
index 0000000..ece2420
--- /dev/null
+++ b/src/Resources/Reverse.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Ipsp\Resources;
+
+use Ipsp\Resource;
+
+/**
+ * Class Refund
+ */
+class Reverse extends Resource
+{
+    protected $path   = '/reverse/order_id';
+
+    protected $fields = array(
+        'merchant_id'=>array(
+            'type'    => 'string',
+            'required'=>TRUE
+        ),
+        'order_id'=>array(
+            'type'    => 'string',
+            'required'=>TRUE
+        ),
+        'currency' => array(
+            'type' => 'string',
+            'required'=>TRUE
+        ),
+        'amount' => array(
+            'type' => 'integer',
+            'required'=>TRUE
+        ),
+        'signature' => array(
+            'type' => 'string',
+            'required'=>TRUE
+        ),
+        'version' => array(
+            'type' => 'string',
+            'required'=>FALSE
+        )
+    );
+
+}
\ No newline at end of file
diff --git a/src/Resources/Status.php b/src/Resources/Status.php
new file mode 100644
index 0000000..1bed6d2
--- /dev/null
+++ b/src/Resources/Status.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Ipsp\Resources;
+
+use Ipsp\Resource;
+
+/**
+ * Class PaymentStatus
+ */
+class Status extends Resource
+{
+    protected $path   = '/status/order_id';
+    protected $fields = array(
+        'order_id'=>array(
+            'type'    => 'string',
+            'required'=>TRUE
+        ),
+        'merchant_id'=>array(
+            'type' => 'string',
+            'required'=>TRUE
+        ),
+        'signature' => array(
+            'type' => 'string',
+            'required'=>TRUE
+        ),
+        'version' => array(
+            'type' => 'string',
+            'required'=>FALSE
+        )
+    );
+}
\ No newline at end of file
diff --git a/src/Resources/Verification.php b/src/Resources/Verification.php
new file mode 100644
index 0000000..884b04f
--- /dev/null
+++ b/src/Resources/Verification.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Ipsp\Resources;
+
+use Ipsp\Resource;
+
+/**
+ * Class Refund
+ */
+class Verification extends Resource
+{
+    protected $path   = '/checkout/url';
+    protected $defaultParams = array(
+        'verification'=>'y',
+        'verification_type'=>'code'
+    );
+    protected $fields = array(
+        'merchant_id'=>array(
+            'type'    => 'string',
+            'required'=>TRUE
+        ),
+        'order_id'=>array(
+            'type'    => 'string',
+            'required'=>TRUE
+        ),
+        'currency' => array(
+            'type' => 'string',
+            'required'=>TRUE
+        ),
+        'amount' => array(
+            'type' => 'integer',
+            'required'=>TRUE
+        ),
+        'verification'=>array(
+            'type' => 'string',
+            'equal'=> 'y'
+        ),
+        'verification_type'=>array(
+            'type' => 'string',
+            'equal'=> 'y',
+            'required'=>TRUE
+        ),
+        'signature' => array(
+            'type' => 'string',
+            'required'=>TRUE
+        ),
+        'version' => array(
+            'type' => 'string',
+            'required'=>FALSE
+        )
+    );
+}
\ No newline at end of file
diff --git a/Ipsp/Response.php b/src/Response.php
similarity index 94%
rename from Ipsp/Response.php
rename to src/Response.php
index c0abff0..767a6b2 100644
--- a/Ipsp/Response.php
+++ b/src/Response.php
@@ -1,9 +1,11 @@
 <?php
 
+namespace Ipsp;
+
 /**
- * Class Ipsp_Response
+ * Class Response
  */
-class Ipsp_Response {
+class Response {
     private $data = array();
     public function __construct($data=array()){
         $this->data = $data;
diff --git a/Ipsp/XmlData.php b/src/XmlData.php
similarity index 93%
rename from Ipsp/XmlData.php
rename to src/XmlData.php
index 9b1645d..cec9ffb 100644
--- a/Ipsp/XmlData.php
+++ b/src/XmlData.php
@@ -1,6 +1,8 @@
 <?php
 
-class Ipsp_XmlData extends \SimpleXMLElement{
+namespace Ipsp;
+
+class XmlData extends \SimpleXMLElement{
     /**
      * @param array $array
      */