Reordered directory stucture