renamed packages and added serializers for gson