Moved some classes to API.