Rename the dirs; forgot it in the previous commit.