Reorganized the folder structure