Finish converting to xbmcvfs