Rearranged directory structure and file names.