More idiomatic file paths

Via @melissanoelle