reorganize +  added gson