diff --git a/Block/AuthBlock.php b/Block/AuthBlock.php
index 4df5c30..ba7dc2f 100644
--- a/Block/AuthBlock.php
+++ b/Block/AuthBlock.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cardinity\Payment\Block;
+namespace Cardinity\Magento\Block;
 
 class AuthBlock extends \Magento\Framework\View\Element\Template
 {
@@ -49,6 +49,6 @@ public function getCallbackUrl()
 
     private function _getAuthModel()
     {
-        return $this->_objectManager->create('Cardinity\Payment\Model\AuthModel');
+        return $this->_objectManager->create('Cardinity\Magento\Model\AuthModel');
     }
 }
diff --git a/Block/ExternalBlock.php b/Block/ExternalBlock.php
index 6626f82..dc80f0e 100644
--- a/Block/ExternalBlock.php
+++ b/Block/ExternalBlock.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cardinity\Payment\Block;
+namespace Cardinity\Magento\Block;
 
 class ExternalBlock extends \Magento\Framework\View\Element\Template
 {
@@ -86,6 +86,6 @@ public function getCallbackUrl()
 
     private function _getExternalModel()
     {
-        return $this->_objectManager->create('Cardinity\Payment\Model\ExternalModel');
+        return $this->_objectManager->create('Cardinity\Magento\Model\ExternalModel');
     }
 }
diff --git a/Controller/Payment.php b/Controller/Payment.php
index f6d1ac5..b45e8e0 100755
--- a/Controller/Payment.php
+++ b/Controller/Payment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cardinity\Payment\Controller;
+namespace Cardinity\Magento\Controller;
 
 
 use Magento\Framework\App\CsrfAwareActionInterface;
@@ -17,7 +17,7 @@ abstract class Payment extends \Magento\Framework\App\Action\Action implements C
 
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
-        \Cardinity\Payment\Logger\Logger $logger,
+        \Cardinity\Magento\Logger\Logger $logger,
         \Magento\Framework\View\Result\PageFactory $pageFactory,
 
         \Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface $transactionBuilder,
@@ -40,7 +40,7 @@ public function __construct(
         $this->_transactionBuilder = $transactionBuilder;
 
         
-        $this->_configData = $this->_objectManager->get('Cardinity\Payment\Helper\Data');
+        $this->_configData = $this->_objectManager->get('Cardinity\Magento\Helper\Data');
     }
 
      /**
@@ -74,17 +74,17 @@ protected function _getOrderModel()
 
     protected function _getAuthModel()
     {
-        return $this->_objectManager->create('Cardinity\Payment\Model\AuthModel');
+        return $this->_objectManager->create('Cardinity\Magento\Model\AuthModel');
     }
 
     protected function _getExternalModel()
     {
-        return $this->_objectManager->create('Cardinity\Payment\Model\ExternalModel');
+        return $this->_objectManager->create('Cardinity\Magento\Model\ExternalModel');
     }
 
     protected function _getPaymentModel()
     {
-        return $this->_objectManager->create('Cardinity\Payment\Model\PaymentModel');
+        return $this->_objectManager->create('Cardinity\Magento\Model\PaymentModel');
     }
 
     protected function _setMessage($message, $type)
diff --git a/Controller/Payment/Auth.php b/Controller/Payment/Auth.php
index 895d2e5..62f5e06 100644
--- a/Controller/Payment/Auth.php
+++ b/Controller/Payment/Auth.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cardinity\Payment\Controller\Payment;
+namespace Cardinity\Magento\Controller\Payment;
 
-class Auth extends \Cardinity\Payment\Controller\Payment
+class Auth extends \Cardinity\Magento\Controller\Payment
 {
     public function execute()
     {
diff --git a/Controller/Payment/Authv2.php b/Controller/Payment/Authv2.php
index 46c409b..227a44d 100644
--- a/Controller/Payment/Authv2.php
+++ b/Controller/Payment/Authv2.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cardinity\Payment\Controller\Payment;
+namespace Cardinity\Magento\Controller\Payment;
 
-class Authv2 extends \Cardinity\Payment\Controller\Payment
+class Authv2 extends \Cardinity\Magento\Controller\Payment
 {
     public function execute()
     {
diff --git a/Controller/Payment/Callback.php b/Controller/Payment/Callback.php
index dd0c9a8..af93f9c 100644
--- a/Controller/Payment/Callback.php
+++ b/Controller/Payment/Callback.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cardinity\Payment\Controller\Payment;
+namespace Cardinity\Magento\Controller\Payment;
 
-class Callback extends \Cardinity\Payment\Controller\Payment
+class Callback extends \Cardinity\Magento\Controller\Payment
 {
     public function execute()
     {
diff --git a/Controller/Payment/Callbackexternal.php b/Controller/Payment/Callbackexternal.php
index 2e53280..7564f5f 100644
--- a/Controller/Payment/Callbackexternal.php
+++ b/Controller/Payment/Callbackexternal.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cardinity\Payment\Controller\Payment;
+namespace Cardinity\Magento\Controller\Payment;
 
-class Callbackexternal extends \Cardinity\Payment\Controller\Payment
+class Callbackexternal extends \Cardinity\Magento\Controller\Payment
 {
     public function execute()
     {
diff --git a/Controller/Payment/Callbackv2.php b/Controller/Payment/Callbackv2.php
index 1cdb32b..2e1b877 100644
--- a/Controller/Payment/Callbackv2.php
+++ b/Controller/Payment/Callbackv2.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cardinity\Payment\Controller\Payment;
+namespace Cardinity\Magento\Controller\Payment;
 
-class Callbackv2 extends \Cardinity\Payment\Controller\Payment
+class Callbackv2 extends \Cardinity\Magento\Controller\Payment
 {
     public function execute()
     {
diff --git a/Controller/Payment/External.php b/Controller/Payment/External.php
index e8bafc0..e95e9bd 100644
--- a/Controller/Payment/External.php
+++ b/Controller/Payment/External.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cardinity\Payment\Controller\Payment;
+namespace Cardinity\Magento\Controller\Payment;
 
-class External extends \Cardinity\Payment\Controller\Payment
+class External extends \Cardinity\Magento\Controller\Payment
 {
     public function execute()
     {
diff --git a/Controller/Payment/Failure.php b/Controller/Payment/Failure.php
index cbdc222..3a750a1 100644
--- a/Controller/Payment/Failure.php
+++ b/Controller/Payment/Failure.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cardinity\Payment\Controller\Payment;
+namespace Cardinity\Magento\Controller\Payment;
 
-class Failure extends \Cardinity\Payment\Controller\Payment
+class Failure extends \Cardinity\Magento\Controller\Payment
 {
     public function execute()
     {
diff --git a/Controller/Payment/Redirect.php b/Controller/Payment/Redirect.php
index 8a063c6..8f19a02 100644
--- a/Controller/Payment/Redirect.php
+++ b/Controller/Payment/Redirect.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cardinity\Payment\Controller\Payment;
+namespace Cardinity\Magento\Controller\Payment;
 
-class Redirect extends \Cardinity\Payment\Controller\Payment
+class Redirect extends \Cardinity\Magento\Controller\Payment
 {
     public function execute()
     {
diff --git a/Controller/Payment/Success.php b/Controller/Payment/Success.php
index bcd775d..cdca227 100644
--- a/Controller/Payment/Success.php
+++ b/Controller/Payment/Success.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cardinity\Payment\Controller\Payment;
+namespace Cardinity\Magento\Controller\Payment;
 
-class Success extends \Cardinity\Payment\Controller\Payment
+class Success extends \Cardinity\Magento\Controller\Payment
 {
     public function execute()
     {
diff --git a/Helper/Data.php b/Helper/Data.php
index 9698ceb..edea2c5 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cardinity\Payment\Helper;
+namespace Cardinity\Magento\Helper;
 
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
diff --git a/Logger/Handler.php b/Logger/Handler.php
index 8fff148..c7c9a29 100644
--- a/Logger/Handler.php
+++ b/Logger/Handler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cardinity\Payment\Logger;
+namespace Cardinity\Magento\Logger;
 
 class Handler extends \Magento\Framework\Logger\Handler\Base
 {
diff --git a/Logger/Logger.php b/Logger/Logger.php
index 669b410..3351d95 100644
--- a/Logger/Logger.php
+++ b/Logger/Logger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cardinity\Payment\Logger;
+namespace Cardinity\Magento\Logger;
 
 class Logger extends \Monolog\Logger
 {
diff --git a/Model/AuthModel.php b/Model/AuthModel.php
index 92f0b41..bbd3d9e 100644
--- a/Model/AuthModel.php
+++ b/Model/AuthModel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cardinity\Payment\Model;
+namespace Cardinity\Magento\Model;
 
 class AuthModel
 {
diff --git a/Model/CustomConfigProvider.php b/Model/CustomConfigProvider.php
index f3c4cf1..62fae53 100644
--- a/Model/CustomConfigProvider.php
+++ b/Model/CustomConfigProvider.php
@@ -1,5 +1,5 @@
 <?php
-namespace Cardinity\Payment\Model;
+namespace Cardinity\Magento\Model;
 
 use Magento\Checkout\Model\ConfigProviderInterface;
 
@@ -17,7 +17,7 @@ public function getConfig()
         $config['customData'] = 'My Custom Data text.';
         
 
-        $configData = $this->_objectManager->get('Cardinity\Payment\Helper\Data');        
+        $configData = $this->_objectManager->get('Cardinity\Magento\Helper\Data');        
         $config['externalEnabled'] = $configData->getConfig('payment/cardinity/external_enabled');
 
         return $config;
diff --git a/Model/ExternalModel.php b/Model/ExternalModel.php
index cd86c76..2ad714c 100644
--- a/Model/ExternalModel.php
+++ b/Model/ExternalModel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cardinity\Payment\Model;
+namespace Cardinity\Magento\Model;
 
 class ExternalModel
 {
diff --git a/Model/PaymentModel.php b/Model/PaymentModel.php
index 8956120..8470643 100755
--- a/Model/PaymentModel.php
+++ b/Model/PaymentModel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cardinity\Payment\Model;
+namespace Cardinity\Magento\Model;
 
 use Cardinity\Client;
 use Cardinity\Exception;
@@ -399,13 +399,13 @@ private function _log($message)
 
     private function _getAuthModel()
     {
-        return $this->_objectManager->create('Cardinity\Payment\Model\AuthModel');
+        return $this->_objectManager->create('Cardinity\Magento\Model\AuthModel');
     }
 
 
     private function _getExternalModel()
     {
-        return $this->_objectManager->create('Cardinity\Payment\Model\ExternalModel');
+        return $this->_objectManager->create('Cardinity\Magento\Model\ExternalModel');
     }
 
 
diff --git a/README.md b/README.md
index 4f411a1..71c1787 100755
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Once you redirected to Keys page copy private and public access key
 Login to your store admin panel
 
 ### Using app/code
-put this inside app/code/Cardinity/Payment
+put this inside app/code/Cardinity/Magento
 
 add
 ```
diff --git a/composer.json b/composer.json
index 37c6ab6..a82dcfc 100755
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "cardinity/cardinity-magento",
+    "name": "cardinity/magento",
     "description": "Cardinity Payment Gateway for Magento 2",
     "type": "magento2-module",
     "version": "2.0.0",
@@ -13,7 +13,7 @@
             "registration.php"
         ],
         "psr-4": {
-            "Cardinity\\Payment\\": ""
+            "Cardinity\\Magento\\": ""
         }
     }
 }
diff --git a/etc/config.xml b/etc/config.xml
index 898cc40..83bb54a 100755
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -5,7 +5,7 @@
             <cardinity>
                 <active>0</active>
                 <title>Cardinity</title>
-                <model>Cardinity\Payment\Model\PaymentModel</model>
+                <model>Cardinity\Magento\Model\PaymentModel</model>
                 <payment_action>sale</payment_action>
                 <order_status>pending_payment</order_status>
                 <cctypes>MC,MI,VI,DN</cctypes>
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index 5778670..fdb6f08 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <virtualType name="Cardinity\Payment\Model\ConfigProvider" type="Magento\Payment\Model\CcGenericConfigProvider">
+    <virtualType name="Cardinity\Magento\Model\ConfigProvider" type="Magento\Payment\Model\CcGenericConfigProvider">
         <arguments>
             <argument name="methodCodes" xsi:type="array">
-                <item name="cardinity" xsi:type="const">Cardinity\Payment\Model\PaymentModel::CODE</item>
+                <item name="cardinity" xsi:type="const">Cardinity\Magento\Model\PaymentModel::CODE</item>
             </argument>
         </arguments>
     </virtualType>
     <type name="Magento\Checkout\Model\CompositeConfigProvider">
         <arguments>
             <argument name="configProviders" xsi:type="array">
-                <item name="cardinity_config_provider" xsi:type="object">Cardinity\Payment\Model\ConfigProvider</item>
-                <item name="checkout_config_custom_data" xsi:type="object">Cardinity\Payment\Model\CustomConfigProvider</item>
+                <item name="cardinity_config_provider" xsi:type="object">Cardinity\Magento\Model\ConfigProvider</item>
+                <item name="checkout_config_custom_data" xsi:type="object">Cardinity\Magento\Model\CustomConfigProvider</item>
             </argument>
         </arguments>
     </type>
-    <type name="Cardinity\Payment\Logger\Handler">
+    <type name="Cardinity\Magento\Logger\Handler">
         <arguments>
             <argument name="filesystem" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
         </arguments>
     </type>
-    <type name="Cardinity\Payment\Logger\Logger">
+    <type name="Cardinity\Magento\Logger\Logger">
         <arguments>
             <argument name="name" xsi:type="string">cardinityLogHandler</argument>
             <argument name="handlers" xsi:type="array">
-                <item name="system" xsi:type="object">Cardinity\Payment\Logger\Handler</item>
+                <item name="system" xsi:type="object">Cardinity\Magento\Logger\Handler</item>
             </argument>
         </arguments>
     </type>
diff --git a/etc/frontend/routes.xml b/etc/frontend/routes.xml
index 20fbe38..61fc936 100644
--- a/etc/frontend/routes.xml
+++ b/etc/frontend/routes.xml
@@ -2,7 +2,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
     <router id="standard">
         <route id="cardinity" frontName="cardinity">
-            <module name="Cardinity_Payment"/>
+            <module name="Cardinity_Magento"/>
         </route>
     </router>
 </config>
diff --git a/etc/module.xml b/etc/module.xml
index 579d0e2..faecfa2 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Cardinity_Payment" setup_version="1.0.0">
+    <module name="Cardinity_Magento" setup_version="1.0.0">
     </module>
 </config>
diff --git a/registration.php b/registration.php
index 6b924cf..f1e904c 100644
--- a/registration.php
+++ b/registration.php
@@ -2,6 +2,6 @@
 
 \Magento\Framework\Component\ComponentRegistrar::register(
     \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Cardinity_Payment',
+    'Cardinity_Magento',
     __DIR__
 );
diff --git a/view/frontend/layout/cardinity_payment_auth.xml b/view/frontend/layout/cardinity_payment_auth.xml
index dfad3df..8e561ff 100644
--- a/view/frontend/layout/cardinity_payment_auth.xml
+++ b/view/frontend/layout/cardinity_payment_auth.xml
@@ -2,6 +2,6 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <referenceContainer name="content">
-        <block class="Cardinity\Payment\Block\AuthBlock" name="cardinity" template="auth.phtml" cacheable="false"/>
+        <block class="Cardinity\Magento\Block\AuthBlock" name="cardinity" template="auth.phtml" cacheable="false"/>
     </referenceContainer>
 </page>
diff --git a/view/frontend/layout/cardinity_payment_authv2.xml b/view/frontend/layout/cardinity_payment_authv2.xml
index 1495c36..298c0a6 100644
--- a/view/frontend/layout/cardinity_payment_authv2.xml
+++ b/view/frontend/layout/cardinity_payment_authv2.xml
@@ -2,6 +2,6 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <referenceContainer name="content">
-        <block class="Cardinity\Payment\Block\AuthBlock" name="cardinity" template="authv2.phtml" cacheable="false"/>
+        <block class="Cardinity\Magento\Block\AuthBlock" name="cardinity" template="authv2.phtml" cacheable="false"/>
     </referenceContainer>
 </page>
diff --git a/view/frontend/layout/cardinity_payment_external.xml b/view/frontend/layout/cardinity_payment_external.xml
index 214e57d..951d42b 100644
--- a/view/frontend/layout/cardinity_payment_external.xml
+++ b/view/frontend/layout/cardinity_payment_external.xml
@@ -2,6 +2,6 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <referenceContainer name="content">
-        <block class="Cardinity\Payment\Block\ExternalBlock" name="cardinity_external" template="external.phtml" cacheable="false"/>
+        <block class="Cardinity\Magento\Block\ExternalBlock" name="cardinity_external" template="external.phtml" cacheable="false"/>
     </referenceContainer>
 </page>
diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
index a294afb..d3da011 100644
--- a/view/frontend/layout/checkout_index_index.xml
+++ b/view/frontend/layout/checkout_index_index.xml
@@ -18,7 +18,7 @@
                                                             <!-- merge payment method renders here -->
                                                             <item name="children" xsi:type="array">
                                                                 <item name="cardinity-payments" xsi:type="array">
-                                                                    <item name="component" xsi:type="string">Cardinity_Payment/js/view/payment/cardinity</item>
+                                                                    <item name="component" xsi:type="string">Cardinity_Magento/js/view/payment/cardinity</item>
                                                                     <item name="methods" xsi:type="array">
                                                                         <item name="cardinity" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
diff --git a/view/frontend/web/js/view/payment/cardinity.js b/view/frontend/web/js/view/payment/cardinity.js
index feff371..3a998f3 100644
--- a/view/frontend/web/js/view/payment/cardinity.js
+++ b/view/frontend/web/js/view/payment/cardinity.js
@@ -11,7 +11,7 @@ define(
         rendererList.push(
             {
                 type: 'cardinity',
-                component: 'Cardinity_Payment/js/view/payment/method-renderer/cardinity-external-method'
+                component: 'Cardinity_Magento/js/view/payment/method-renderer/cardinity-external-method'
             }
         );
 
diff --git a/view/frontend/web/js/view/payment/method-renderer/cardinity-external-method.js b/view/frontend/web/js/view/payment/method-renderer/cardinity-external-method.js
index 2f0ab66..10cdf6c 100755
--- a/view/frontend/web/js/view/payment/method-renderer/cardinity-external-method.js
+++ b/view/frontend/web/js/view/payment/method-renderer/cardinity-external-method.js
@@ -13,9 +13,9 @@ define(
         var displayTemplte;
 
         if(window.checkoutConfig.externalEnabled == 1){
-            displayTemplte = 'Cardinity_Payment/payment/cardinity-external-form';
+            displayTemplte = 'Cardinity_Magento/payment/cardinity-external-form';
         }else{
-            displayTemplte = 'Cardinity_Payment/payment/cardinity-form';
+            displayTemplte = 'Cardinity_Magento/payment/cardinity-form';
         }
         
 
diff --git a/view/frontend/web/js/view/payment/method-renderer/cardinity-method.js b/view/frontend/web/js/view/payment/method-renderer/cardinity-method.js
index 2e31558..07a6469 100644
--- a/view/frontend/web/js/view/payment/method-renderer/cardinity-method.js
+++ b/view/frontend/web/js/view/payment/method-renderer/cardinity-method.js
@@ -14,7 +14,7 @@ define(
             redirectAfterPlaceOrder: false,
 
             defaults: {
-                template: 'Cardinity_Payment/payment/cardinity-form'
+                template: 'Cardinity_Magento/payment/cardinity-form'
             },
 
             getCode: function () {