* Add ability to have a different name for folder --------- Co-authored-by: Simon <simobilleter@gmail.com>