Oops, wrong dir names
Revert "Oops, wrong dir names"

This reverts commit f9546d193e51baca6069c825016eb4f743b971d2.