Make a little more sense of "bug" dir