(fixed) tidy directory names