Api service refactoring
Api renamed to api on client