Rename folder and move one level up