added json data and reorganized files