Added gson and claned out the files