Rearranged directory structure.