Reorganized files struct