More sane directory structure.