Rearranged directories for modules