No need to rename folder anymore