Consolidate correspondence and update rakefile to account for directories.