Refactoring: moving more classes to API