reorganized the folder structure