Somewhat less stupid directory structure.