Changes the package service name to services
merge and added marshallers
remove ToJSONTEST.java