finished modularizing external api services