Split FilePath into DirPath and FilePath

I'm not quite sure what to do with this yet. That should be part of another PR.