Added JSON and modified some files