Close #16: Better directory names