Reorganized the file structure.