Updated file-structure and added json2