reordered directory structure