Tidy directory naming. Previous included translation