Fixing help message having a dangling space at the beginning
Moving rename code into Catalog. Simplifying messages to user. Need to move calls to extradata code into Catalog class.