Remove underscore from directory names