Initial code to move server APIs to be with apps; PD done