Fixing renames for folders containing files.

Resolves #51.
Fixing return-to-save for renaming.