Added the 'raw' data in json format, and reorganized the files