move api stuff into elb package