Directory reordering and design changes;