Changed File Layout and added json library