You’ll be able to merge and rename all of your folders via the [Rename Folder] button on the Documents page.

To rename the folder you’ll need to select [Move into new folder] and name the folder as desired.

To merge existing folders, click [Move into new folder] for one of the folders and select the folder you’ll like to move it to.