d084967627
This reverts commit ec03ab021f.
Changing this since it looks like Mattieu does not really like the change.
Will be adding another way to tweak the directories