Adding support for simple folder naming in CLI and --extension