diff --git a/Model/Currency/Import/AbstractDto.php b/Model/Currency/Import/AbstractDto.php
index 99de094..ba21ffb 100644
--- a/Model/Currency/Import/AbstractDto.php
+++ b/Model/Currency/Import/AbstractDto.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace OxCom\CurrencyServices\Model\Currency\Import;
+namespace OxCom\MagentoCurrencyServices\Model\Currency\Import;
 
 /**
  * Class AbstractDto
  *
- * @package OxCom\CurrencyServices\Model\Currency\Import
+ * @package OxCom\MagentoCurrencyServices\Model\Currency\Import
  */
 abstract class AbstractDto
 {
diff --git a/Model/Currency/Import/AbstractSource.php b/Model/Currency/Import/AbstractSource.php
index c6d9640..7f759cd 100644
--- a/Model/Currency/Import/AbstractSource.php
+++ b/Model/Currency/Import/AbstractSource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace OxCom\CurrencyServices\Model\Currency\Import;
+namespace OxCom\MagentoCurrencyServices\Model\Currency\Import;
 
 /**
  * Class AbstractSource
  *
- * @package OxCom\CurrencyServices\Model\Currency\Import
+ * @package OxCom\MagentoCurrencyServices\Model\Currency\Import
  */
 abstract class AbstractSource extends \Magento\Directory\Model\Currency\Import\AbstractImport
 {
diff --git a/Model/Currency/Import/Ecb.php b/Model/Currency/Import/Ecb.php
index 98a17ee..36cd271 100644
--- a/Model/Currency/Import/Ecb.php
+++ b/Model/Currency/Import/Ecb.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace OxCom\CurrencyServices\Model\Currency\Import;
+namespace OxCom\MagentoCurrencyServices\Model\Currency\Import;
 
-use OxCom\CurrencyServices\Model\Currency\Import\Ecb\Rates;
+use OxCom\MagentoCurrencyServices\Model\Currency\Import\Ecb\Rates;
 
 /**
  * Class Ecb
  *
- * @package OxCom\CurrencyServices\Model\Currency\Import
+ * @package OxCom\MagentoCurrencyServices\Model\Currency\Import
  */
 class Ecb extends AbstractSource
 {
diff --git a/Model/Currency/Import/Ecb/Rates.php b/Model/Currency/Import/Ecb/Rates.php
index 185546f..cdceb6b 100755
--- a/Model/Currency/Import/Ecb/Rates.php
+++ b/Model/Currency/Import/Ecb/Rates.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace OxCom\CurrencyServices\Model\Currency\Import\Ecb;
+namespace OxCom\MagentoCurrencyServices\Model\Currency\Import\Ecb;
 
-use OxCom\CurrencyServices\Model\Currency\Import\AbstractDto;
+use OxCom\MagentoCurrencyServices\Model\Currency\Import\AbstractDto;
 
 /**
  * Class Rates
  *
- * @package OxCom\CurrencyServices\Model\Currency\Import\Ecb
+ * @package OxCom\MagentoCurrencyServices\Model\Currency\Import\Ecb
  */
 class Rates extends AbstractDto
 {
diff --git a/Model/Currency/Import/Fixer.php b/Model/Currency/Import/Fixer.php
index d6c36e0..122406f 100644
--- a/Model/Currency/Import/Fixer.php
+++ b/Model/Currency/Import/Fixer.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace OxCom\CurrencyServices\Model\Currency\Import;
+namespace OxCom\MagentoCurrencyServices\Model\Currency\Import;
 
-use OxCom\CurrencyServices\Model\Currency\Import\Fixer\Rates;
+use OxCom\MagentoCurrencyServices\Model\Currency\Import\Fixer\Rates;
 
 /**
  * Class Fixer
  *
- * @package OxCom\CurrencyServices\Model\Currency\Import
+ * @package OxCom\MagentoCurrencyServices\Model\Currency\Import
  */
 class Fixer extends AbstractSource
 {
diff --git a/Model/Currency/Import/Fixer/Rates.php b/Model/Currency/Import/Fixer/Rates.php
index b31affc..ea96be0 100755
--- a/Model/Currency/Import/Fixer/Rates.php
+++ b/Model/Currency/Import/Fixer/Rates.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace OxCom\CurrencyServices\Model\Currency\Import\Fixer;
+namespace OxCom\MagentoCurrencyServices\Model\Currency\Import\Fixer;
 
-use OxCom\CurrencyServices\Model\Currency\Import\AbstractDto;
+use OxCom\MagentoCurrencyServices\Model\Currency\Import\AbstractDto;
 
 /**
  * Class Rates
  *
- * @package OxCom\CurrencyServices\Model\Currency\Import\Fixer
+ * @package OxCom\MagentoCurrencyServices\Model\Currency\Import\Fixer
  */
 class Rates extends AbstractDto
 {
diff --git a/Model/Currency/Import/Google.php b/Model/Currency/Import/Google.php
index d302212..917bb7a 100644
--- a/Model/Currency/Import/Google.php
+++ b/Model/Currency/Import/Google.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace OxCom\CurrencyServices\Model\Currency\Import;
+namespace OxCom\MagentoCurrencyServices\Model\Currency\Import;
 
 /**
  * Class Google
  *
- * @package OxCom\CurrencyServices\Model\Currency\Import
+ * @package OxCom\MagentoCurrencyServices\Model\Currency\Import
  */
 class Google extends AbstractSource
 {
diff --git a/Model/Currency/Import/Yahoo.php b/Model/Currency/Import/Yahoo.php
index e0019e3..4de8062 100644
--- a/Model/Currency/Import/Yahoo.php
+++ b/Model/Currency/Import/Yahoo.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace OxCom\CurrencyServices\Model\Currency\Import;
+namespace OxCom\MagentoCurrencyServices\Model\Currency\Import;
 
 /**
  * Class Yahoo
  *
- * @package OxCom\CurrencyServices\Model\Currency\Import
+ * @package OxCom\MagentoCurrencyServices\Model\Currency\Import
  */
 class Yahoo extends AbstractSource
 {
diff --git a/README.md b/README.md
index a684b05..b480bdb 100644
--- a/README.md
+++ b/README.md
@@ -8,14 +8,19 @@ This is a module that allows to update currency rates from addition external sou
 4. [Fixer](http://fixer.io/)
 
 ## Install
-N/A
+```bash
+$ composer require oxcom/magento-currency-services
+$ bin/magento module:enable OxCom_MagentoCurrencyServices
+$ bin/magento setup:upgrade
+$ php bin/magento setup:di:compile
+```
 
 ## Tests
 Test will be performed on real sources, so internet connection is required.
 
 ```bash
 $ composer install
-$ vendor/bin/phpunit -c tests/phpunit.xml
+$ vendor/bin/phpunit -c Test/phpunit.xml
 ```
 
 ## Thanks
diff --git a/tests/Generate/CurrencyFactory.php b/Test/Generate/CurrencyFactory.php
similarity index 100%
rename from tests/Generate/CurrencyFactory.php
rename to Test/Generate/CurrencyFactory.php
diff --git a/tests/Generate/function.php b/Test/Generate/function.php
similarity index 100%
rename from tests/Generate/function.php
rename to Test/Generate/function.php
diff --git a/tests/Model/AbstractTestCase.php b/Test/Model/AbstractTestCase.php
similarity index 90%
rename from tests/Model/AbstractTestCase.php
rename to Test/Model/AbstractTestCase.php
index b2a700a..7730c1b 100644
--- a/tests/Model/AbstractTestCase.php
+++ b/Test/Model/AbstractTestCase.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace OxCom\CurrencyServices\Test\Model;
+namespace OxCom\MagentoCurrencyServices\Test\Model;
 
 use PHPUnit\Framework\TestCase;
 
 /**
  * Class AbstractTestCase
  *
- * @package OxCom\CurrencyServices\Test\Model
+ * @package OxCom\MagentoCurrencyServices\Test\Model
  */
 abstract class AbstractTestCase extends TestCase
 {
diff --git a/tests/Model/Currency/Import/SourceTest.php b/Test/Model/Currency/Import/SourceTest.php
similarity index 56%
rename from tests/Model/Currency/Import/SourceTest.php
rename to Test/Model/Currency/Import/SourceTest.php
index cdfbd45..6c616ca 100644
--- a/tests/Model/Currency/Import/SourceTest.php
+++ b/Test/Model/Currency/Import/SourceTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace OxCom\CurrencyServices\Test\Model\Currency\Import;
+namespace OxCom\MagentoCurrencyServices\Test\Model\Currency\Import;
 
-use OxCom\CurrencyServices\Test\Model\AbstractTestCase;
+use OxCom\MagentoCurrencyServices\Test\Model\AbstractTestCase;
 
 /**
  * Class GoogleTest
  *
- * @package OxCom\CurrencyServices\Test\Model\Currency\Import
+ * @package OxCom\MagentoCurrencyServices\Test\Model\Currency\Import
  */
 class SourceTest extends AbstractTestCase
 {
@@ -20,7 +20,7 @@ class SourceTest extends AbstractTestCase
      */
     public function testSources($sourceClass)
     {
-        /** @var \OxCom\CurrencyServices\Model\Currency\Import\Google $source */
+        /** @var \OxCom\MagentoCurrencyServices\Model\Currency\Import\Google $source */
         $source = $this->om->getObject($sourceClass);
 
         $method = new \ReflectionMethod($source, '_convert');
@@ -41,10 +41,10 @@ public function testSources($sourceClass)
     public function generateSource()
     {
         return [
-            [\OxCom\CurrencyServices\Model\Currency\Import\Google::class],
-            [\OxCom\CurrencyServices\Model\Currency\Import\Yahoo::class],
-            [\OxCom\CurrencyServices\Model\Currency\Import\Fixer::class],
-            [\OxCom\CurrencyServices\Model\Currency\Import\Ecb::class],
+            [\OxCom\MagentoCurrencyServices\Model\Currency\Import\Google::class],
+            [\OxCom\MagentoCurrencyServices\Model\Currency\Import\Yahoo::class],
+            [\OxCom\MagentoCurrencyServices\Model\Currency\Import\Fixer::class],
+            [\OxCom\MagentoCurrencyServices\Model\Currency\Import\Ecb::class],
         ];
     }
 }
diff --git a/tests/bootstrap.php b/Test/bootstrap.php
similarity index 100%
rename from tests/bootstrap.php
rename to Test/bootstrap.php
diff --git a/tests/phpunit.xml b/Test/phpunit.xml
similarity index 100%
rename from tests/phpunit.xml
rename to Test/phpunit.xml
diff --git a/composer.json b/composer.json
index 16e9f25..802b2b0 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
   },
   "autoload-dev": {
     "classmap": [
-      "tests/Model"
+      "Test/Model"
     ]
   },
   "authors": [
@@ -45,13 +45,6 @@
       "email": "lancer.oxcom@gmail.com"
     }
   ],
-  "scripts": {
-    "test": [
-      "composer install",
-      "./vendor/bin/phpcs --standard=psr2 src/ tests/ZendTwig/ tests/Fixture/",
-      "./vendor/bin/phpunit -c tests/"
-    ]
-  },
   "repositories": [
     {
       "type": "composer",
diff --git a/registration.php b/registration.php
index 782ec2b..27566b8 100644
--- a/registration.php
+++ b/registration.php
@@ -2,6 +2,6 @@
 
 \Magento\Framework\Component\ComponentRegistrar::register(
     \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'OxCOm_MagentoCurrencyServices',
+    'OxCom_MagentoCurrencyServices',
     __DIR__
 );