Rename stuff, get rid of GSON
Add Otto