Moved stuff around, added support for curacao-gson