Changes based on new JSON String

+ Deleting unused files