directory -> folder

same as #575 but comparing against the branch it's based off