Renamed all references, and fixed depricated APIs

*Entry becomes *File or *Dir