Moved json data files into data folder
Fixed file structures