Moving API classes to main, not test.