Use directory instead of folder naming convention

I heard already two complaints. Here we go.