Reorganized files structure