Close #2: Use better directory names