reorganized files structure in project