BIG CHANGE to DIR structure.