Close #27: Better directory names