Reorganized the directory structure.