Reorganizes Json files so that they fit the scheme set by @wayneyu