Slight naming cleanup, and worked out the 'current working directory' issue.
Learned more about how Files work.