Reorganized files in a more intuitive layout