Folder rename to comply with folders nomenclature :)