Unify the use of terms "directory" and "folder"

[VioletGiraffe]

For the nonce it's a mess.Only of these two terms should be used since using both may lead to false impression of them having different meanings.