Clean up file handling.

Use File directly instead of converting them all to Strings and then back to Files again later.