diff --git a/generate b/generate
index 9c5d154..face21b 100755
--- a/generate
+++ b/generate
@@ -66,5 +66,5 @@ software, even if advised of the possibility of such damage.
 
 require_once("vendor/autoload.php");
 
-$application = new \Todaymade\Daux\Generator\Application();
+$application = new \Todaymade\Daux\Console\Application();
 $application->run();
diff --git a/libs/Generator/Application.php b/libs/Console/Application.php
similarity index 93%
rename from libs/Generator/Application.php
rename to libs/Console/Application.php
index 58fdc2b..7a66c68 100644
--- a/libs/Generator/Application.php
+++ b/libs/Console/Application.php
@@ -1,4 +1,4 @@
-<?php namespace Todaymade\Daux\Generator;
+<?php namespace Todaymade\Daux\Console;
 
 use Symfony\Component\Console\Application as SymfonyApplication;
 use Symfony\Component\Console\Input\InputInterface;
@@ -29,7 +29,7 @@ class Application extends SymfonyApplication
         // which is used when using the --help option
         $defaultCommands = parent::getDefaultCommands();
 
-        $defaultCommands[] = new Command();
+        $defaultCommands[] = new Generate();
 
         return $defaultCommands;
     }
diff --git a/libs/Generator/Command.php b/libs/Console/Generate.php
similarity index 96%
rename from libs/Generator/Command.php
rename to libs/Console/Generate.php
index 620f0c1..37c383a 100644
--- a/libs/Generator/Command.php
+++ b/libs/Console/Generate.php
@@ -1,4 +1,4 @@
-<?php namespace Todaymade\Daux\Generator;
+<?php namespace Todaymade\Daux\Console;
 
 use Symfony\Component\Console\Command\Command as SymfonyCommand;
 use Symfony\Component\Console\Input\InputArgument;
@@ -6,7 +6,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Todaymade\Daux\Daux;
 
-class Command extends SymfonyCommand
+class Generate extends SymfonyCommand
 {
     protected function configure()
     {
diff --git a/libs/Format/Base/RunAction.php b/libs/Console/RunAction.php
similarity index 77%
rename from libs/Format/Base/RunAction.php
rename to libs/Console/RunAction.php
index 1186a44..e137829 100644
--- a/libs/Format/Base/RunAction.php
+++ b/libs/Console/RunAction.php
@@ -1,4 +1,4 @@
-<?php namespace Todaymade\Daux\Format\Base;
+<?php namespace Todaymade\Daux\Console;
 
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -7,8 +7,11 @@ trait RunAction
     protected function runAction($title, OutputInterface $output, $width, \Closure $closure)
     {
         $output->write($title);
+
+        $length = function_exists("mb_strlen")? mb_strlen($title) : strlen($title);
+
         // 8 is the length of the label + 2 let it breathe
-        $padding = $width - strlen($title) - 10;
+        $padding = $width - $length - 10;
         try {
             $response = $closure();
         } catch (\Exception $e) {
diff --git a/libs/Format/Confluence/Generator.php b/libs/Format/Confluence/Generator.php
index 779220a..361f9c4 100644
--- a/libs/Format/Confluence/Generator.php
+++ b/libs/Format/Confluence/Generator.php
@@ -3,9 +3,9 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Todaymade\Daux\Config;
+use Todaymade\Daux\Console\RunAction;
 use Todaymade\Daux\Daux;
 use Todaymade\Daux\Format\Confluence\CommonMark\CommonMarkConverter;
-use Todaymade\Daux\Format\Base\RunAction;
 use Todaymade\Daux\Tree\Content;
 use Todaymade\Daux\Tree\Directory;
 
diff --git a/libs/Format/Confluence/Publisher.php b/libs/Format/Confluence/Publisher.php
index 8da36ce..9c8cc9f 100644
--- a/libs/Format/Confluence/Publisher.php
+++ b/libs/Format/Confluence/Publisher.php
@@ -1,12 +1,10 @@
 <?php namespace Todaymade\Daux\Format\Confluence;
 
 use GuzzleHttp\Exception\BadResponseException;
-use GuzzleHttp\Exception\ParseException;
-use Todaymade\Daux\Format\Base\RunAction;
+use Todaymade\Daux\Console\RunAction;
 
 class Publisher
 {
-
     use RunAction;
 
     /**
diff --git a/libs/Format/HTML/Generator.php b/libs/Format/HTML/Generator.php
index de00af6..f68ca20 100644
--- a/libs/Format/HTML/Generator.php
+++ b/libs/Format/HTML/Generator.php
@@ -3,12 +3,12 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Todaymade\Daux\Config;
+use Todaymade\Daux\Console\RunAction;
 use Todaymade\Daux\Daux;
 use Todaymade\Daux\DauxHelper;
 use Todaymade\Daux\Format\Base\CommonMark\CommonMarkConverter;
 use Todaymade\Daux\Format\Base\LiveGenerator;
-use Todaymade\Daux\Format\Base\RunAction;
-use Todaymade\Daux\Generator\Helper;
+use Todaymade\Daux\GeneratorHelper;
 use Todaymade\Daux\Tree\Content;
 use Todaymade\Daux\Tree\Directory;
 use Todaymade\Daux\Tree\Entry;
@@ -47,7 +47,7 @@ class Generator implements \Todaymade\Daux\Format\Base\Generator, LiveGenerator
             $output,
             $width,
             function() use ($destination) {
-                Helper::copyAssets($destination, $this->daux->local_base);
+                GeneratorHelper::copyAssets($destination, $this->daux->local_base);
             }
         );
 
diff --git a/libs/Generator/Helper.php b/libs/GeneratorHelper.php
similarity index 97%
rename from libs/Generator/Helper.php
rename to libs/GeneratorHelper.php
index 48f50d6..65c7cc6 100644
--- a/libs/Generator/Helper.php
+++ b/libs/GeneratorHelper.php
@@ -1,6 +1,6 @@
-<?php namespace Todaymade\Daux\Generator;
+<?php namespace Todaymade\Daux;
 
-class Helper
+class GeneratorHelper
 {
     /**
      * Copy all files from $path to $local_base