reorganized folders and files