Parsed json files and rearranged package structure