Use directory instead of folder naming convention