Close #17: Better directory names