Moved data type adapters into separate package, added gson and xstream