Merged API libs into Services