API refactoring preparation