Merge File basename and direname into split

Faster because only does one split in that case.