Reorganized folders and files