Reorganized the folder structure.