diff --git a/composer.json b/composer.json
index 9589c13..c808a36 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,13 @@
 {
-    "name": "cedextech/trait-generator",
+    "name": "buchin/trait-generator",
     "description": "A Laravel Generator For Creating New Traits",
     "license": "MIT",
-    "authors": [{
-        "name": "Kiran K",
-        "email": "kiran@cedextech.com"
-    }],
+    "authors": [
+        {
+            "name": "Kiran K",
+            "email": "kiran@cedextech.com"
+        }
+    ],
     "require": {
         "php": "^7.0"
     },
@@ -14,4 +16,4 @@
             "Cedextech\\TraitGenerator": "src/"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Commands/TraitMakeCommand.php b/src/Cedextech/TraitGenerator/Commands/TraitMakeCommand.php
similarity index 100%
rename from src/Commands/TraitMakeCommand.php
rename to src/Cedextech/TraitGenerator/Commands/TraitMakeCommand.php
diff --git a/src/ServiceProvider.php b/src/Cedextech/TraitGenerator/ServiceProvider.php
similarity index 100%
rename from src/ServiceProvider.php
rename to src/Cedextech/TraitGenerator/ServiceProvider.php
diff --git a/src/stubs/trait.stub b/src/Cedextech/TraitGenerator/stubs/trait.stub
similarity index 100%
rename from src/stubs/trait.stub
rename to src/Cedextech/TraitGenerator/stubs/trait.stub