Refactor code dealing with save directory and filenames to be simpler. Signed-off-by: Meg Ford <meg387@gmail.com>