Reorganized DIR structure, much more sane now