working on serialization for api
refactor of naming conventions