Fixed bug with underscores in directory names

Signed-off-by: David Brophy <davebrophy@spotify.com>