#8 refactor dataservice for restful services, refactor module structure
cleanup