Better referencing of file names, and a bit of improvements to prevent
FileNotFoundException.