Use directory instead of folder naming convention

I heard already two complaints. Here we go.

If agreed, don't forget to:
- [x] update CHANGES
- [x] check the docs