Move up classes to API module