Add logic for renaming files, cleared warnings, cleaned up doc and usability.