diff --git a/UnitTestFiles/Functionality/FunctionalityTest.php b/UnitTestFiles/Functionality/FunctionalityTest.php
deleted file mode 100644
index b9215d8..0000000
--- a/UnitTestFiles/Functionality/FunctionalityTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/*
- *  -------------------------------------------------------------
- *  Copyright (c) 2020
- *  -All Rights Preserved By  Ariful Islam
- *  -If you have any query then knock me at
- *  arif98741@gmail.com
- *  See my profile @ https://github.com/arif98741
- *  ----------------------------------------------------------------
- *
- */
-
-namespace UnitTestFiles\Test;
-
-
-use Exception;
-use PHPUnit\Framework\TestCase;
-
-class FunctionalityTest extends TestCase
-{
-    /**
-     * @throws Exception
-     */
-    public function testTrueAssetsToTrue()
-    {
-        $condition = true;
-        $this->assertTrue(true);
-    }
-}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 5278e72..a3136be 100644
--- a/composer.json
+++ b/composer.json
@@ -1,25 +1,25 @@
 {
-  "name": "arif98741/nagad-api",
+  "name": "xenon/nagad-api",
   "type": "library",
   "license": "MIT",
   "authors": [
     {
       "name": "Ariful Islam",
       "email": "arif98741@gmail.com",
-      "homepage": "https://phpdark.com",
+      "homepage": "https://github.com/arif98741",
       "role": "Developer, Maintainer"
     }
   ],
   "autoload": {
     "psr-4": {
-      "NagadApi\\": "src/"
+      "Xenon\\NagadApi\\": "src/"
     },
     "psr-0": {
       "UnitTestFiles": ""
     }
   },
   "support": {
-    "email": "admin@phpdark.com"
+    "email": "arif98741@gmail.com"
   },
   "require": {
     "php": "^5.5 || ^7.0 || ^8.0",
diff --git a/readme.md b/readme.md
index 7354aba..45774f6 100644
--- a/readme.md
+++ b/readme.md
@@ -5,7 +5,7 @@
 # Installation Process
 
 ```bash
-composer require arif98741/nagad-api
+composer require xenon/nagad-api
 ```
 
 # Example Code
diff --git a/src/Base.php b/src/Base.php
index 2faaa63..9fda372 100644
--- a/src/Base.php
+++ b/src/Base.php
@@ -10,11 +10,10 @@
  * ----------------------------------------------------------------
  */
 
-namespace NagadApi;
+namespace Xenon\NagadApi;
 
 
-use NagadApi\lib\Key;
-
+use Xenon\NagadApi\lib\Key;
 /**
  * Class Base
  * This is the decision maker where request will go, generate url and also
@@ -78,7 +77,7 @@ public function __construct($config, $params)
 
         /**
          * Before activating production environment be confirm that your system is ok and out of bug
-         * it is highly recommended to test your environment using development environment
+         * it is highly recommended to Test your environment using development environment
          * your ip,domain and callback_url should be whitelisted in Nagad end
          */
         if ($this->keyObject->getAppEnv() == 'production') {
diff --git a/src/Exception/ExceptionHandler.php b/src/Exception/ExceptionHandler.php
index 963ced6..f4068b5 100644
--- a/src/Exception/ExceptionHandler.php
+++ b/src/Exception/ExceptionHandler.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace NagadApi\Exception;
+namespace Xenon\NagadApi\Exception;
 
 
 use Throwable;
diff --git a/src/Helper.php b/src/Helper.php
index 3cb0393..6adef0c 100644
--- a/src/Helper.php
+++ b/src/Helper.php
@@ -9,12 +9,12 @@
  * See my profile @ https://github.com/arif98741
  * ----------------------------------------------------------------
  */
-namespace NagadApi;
+namespace Xenon\NagadApi;
 
 
 use GuzzleHttp\Exception\GuzzleException;
 use NagadApi\Exception\ExceptionHandler;
-use NagadApi\lib\Key;
+use Xenon\NagadApi\lib\Key;
 
 class Helper extends Key
 {
diff --git a/src/RequestHandler.php b/src/RequestHandler.php
index 2914caa..d45027b 100644
--- a/src/RequestHandler.php
+++ b/src/RequestHandler.php
@@ -10,7 +10,7 @@
  * ----------------------------------------------------------------
  */
 
-namespace NagadApi;
+namespace Xenon\NagadApi;
 
 use Exception;
 use NagadApi\Exception\ExceptionHandler;
diff --git a/src/Test/Functionality/FeatureTest.php b/src/Test/Functionality/FeatureTest.php
new file mode 100644
index 0000000..0a8f67c
--- /dev/null
+++ b/src/Test/Functionality/FeatureTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Xenon\NagadApi\Test\Functionality;
+
+use Exception;
+use PHPUnit\Framework\TestCase;
+
+class FeatureTest extends TestCase
+{
+    /**
+     * @throws Exception
+     * @throws Exception
+     */
+    public function testTrueAssetsToTrue()
+    {
+        $condition = true;
+        $this->assertTrue(true);
+    }
+
+}
\ No newline at end of file
diff --git a/UnitTestFiles/Test/phpunit.xml b/src/Test/Test/phpunit.xml
similarity index 100%
rename from UnitTestFiles/Test/phpunit.xml
rename to src/Test/Test/phpunit.xml
diff --git a/src/lib/Key.php b/src/lib/Key.php
index e8ca0ad..8dd7e99 100644
--- a/src/lib/Key.php
+++ b/src/lib/Key.php
@@ -10,14 +10,14 @@
  * ----------------------------------------------------------------
  */
 
-namespace NagadApi\lib;
+namespace Xenon\NagadApi\lib;
 
 /**
  * Class Key
  * This class is using for generating data from environment variable .env
  * This any change in .env file will affect array vale of $_ENV; Array value of
  * .env can be easily find using generateEnv of Key object
- * @package NagadApi\lib
+ * @package Xenon\NagadApi\lib
  */
 class Key
 {