Split FilePath into DirPath and FilePath

I think this should be bucket and path. Having to know how to deconstruct the path in the right way is not great.