diff --git a/composer.json b/composer.json
index 3e069acf..0373a728 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name": "barryvdh/laravel-translation-manager",
+  "name": "tankonyako/laravel-translation-manager",
   "description": "Manage Laravel Translations",
   "keywords": [
     "laravel",
diff --git a/readme.md b/readme.md
index 9ffb5cf4..e9200c9f 100644
--- a/readme.md
+++ b/readme.md
@@ -24,7 +24,7 @@ This way, translations can be saved in git history and no overhead is introduced
 
 Require this package in your composer.json and run composer update (or run `composer require barryvdh/laravel-translation-manager` directly):
 
-    composer require barryvdh/laravel-translation-manager
+    composer require tankonyako/laravel-translation-manager
 
 
 You need to run the migrations for this package.
diff --git a/src/Manager.php b/src/Manager.php
index 17f1bf51..f63ed751 100644
--- a/src/Manager.php
+++ b/src/Manager.php
@@ -97,7 +97,7 @@ public function importTranslations($replace = false, $base = null, $import_group
                     $translations = \Lang::getLoader()->load($locale, $group);
                 } else {
                     $translations = include $file;
-                    $group = 'vendor/'.$vendorName;
+                    $group = 'vendor/'.$vendorName.'/'.$group;
                 }
 
                 if ($translations && is_array($translations)) {
@@ -252,19 +252,26 @@ public function missingKey($namespace, $group, $key)
 
     public function exportTranslations($group = null, $json = false)
     {
-        $group = basename($group);
+		$vendor = false;
+
+		$baseGroup = basename($group);
+		if ($group == '*') {
+			return $this->exportAllTranslations();
+		} else {
+			if (Str::startsWith($group, 'vendor'))
+			{
+				$vendor = true;
+			}
+			else
+			{
+				$group = basename($group);
+			}
+		}
+
         $basePath = $this->app['path.lang'];
 
         if (! is_null($group) && ! $json) {
             if (! in_array($group, $this->config['exclude_groups'])) {
-                $vendor = false;
-                if ($group == '*') {
-                    return $this->exportAllTranslations();
-                } else {
-                    if (Str::startsWith($group, 'vendor')) {
-                        $vendor = true;
-                    }
-                }
 
                 $tree = $this->makeTree(Translation::ofTranslatedGroup($group)
                                                     ->orderByGroupKeys(Arr::get($this->config, 'sort_keys', false))
@@ -278,7 +285,7 @@ public function exportTranslations($group = null, $json = false)
 
                         $locale_path = $locale.DIRECTORY_SEPARATOR.$group;
                         if ($vendor) {
-                            $path = $basePath.'/'.$group.'/'.$locale;
+                            $path = $basePath.'/'.dirname($group);
                             $locale_path = Str::after($group, '/');
                         }
                         $subfolders = explode(DIRECTORY_SEPARATOR, $locale_path);
@@ -294,11 +301,7 @@ public function exportTranslations($group = null, $json = false)
                             }
                         }
 
-                        if ($vendor) {
-                            $path = $path.DIRECTORY_SEPARATOR.'messages.php';
-                        } else {
-                            $path = $path.DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.$group.'.php';
-                        }
+						$path = $path.DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.$baseGroup.'.php';
 
                         $output = "<?php\n\nreturn ".var_export($translations, true).';'.\PHP_EOL;
                         $this->files->put($path, $output);