Added `File::file?` and `File::directory?`
Use `File.file?` in some places