diff --git a/generator/composer.php b/generator/composer.php
index 3091305..c981565 100644
--- a/generator/composer.php
+++ b/generator/composer.php
@@ -120,7 +120,8 @@ function remove_specific_composer_respositories( $package, $composer ) {
  * @return array
  */
 function remove_composer_packages( $composer ) {
-    global $config;
+    global $config, $clio, $info;
+    $clio->styleLine( '😎 Remove Composer packages', $info );
     foreach ( $config as $key => $value ) {
         if ( strpos( $key, 'libraries_' ) !== false ) {
             if ( empty( $value ) ) {
diff --git a/generator/init.php b/generator/init.php
index d8fda35..e9d50a0 100644
--- a/generator/init.php
+++ b/generator/init.php
@@ -53,8 +53,13 @@
 execute_generator( $config );
 // Done!
 echo PHP_EOL;
+$clio->styleLine( 'Last cleanings!', $info );
+remove_empty_folders();
+// Another round to remove the folder that wasn't cleaned at first round
 remove_empty_folders();
 $clio->styleLine( 'Done, I am superfast!', $info );
-$clio->styleLine( 'Don\'t forget to look on https://github.com/WPBP/WordPress-Plugin-Boilerplate-Powered/wiki', $info );
+$clio->styleLine( '', $info );
+$clio->styleLine( '👉 Don\'t forget to look on https://wpbp.github.io/wiki.html', $info );
+$clio->styleLine( '', $info );
 $clio->styleLine( 'Love WordPress-Plugin-Boilerplate-Powered? Please consider supporting our collective:', $info );
 $clio->styleLine( '👉 https://opencollective.com/WordPress-Plugin-Boilerplate-Powered/donate', $info );
diff --git a/generator/rename.php b/generator/rename.php
index 5045fac..cb73ffd 100644
--- a/generator/rename.php
+++ b/generator/rename.php
@@ -22,6 +22,7 @@ function get_files( $path = null ) {
 
     $files = $list = array();
     $clio->styleLine( 'Rename in progress', $info );
+    $clio->styleLine( 'Remove in progress', $info );
     $dir_iterator = new RecursiveDirectoryIterator( $path, FilesystemIterator::SKIP_DOTS );
     $iterator     = new RecursiveIteratorIterator( $dir_iterator, RecursiveIteratorIterator::SELF_FIRST );