Split FilePath into DirPath and FilePath

> I don't think this should be overloaded. 

+1 I think we should just avoid overloading completely, as a rule (even if it's convenient).