Reorganized files, changed icon