Moved API classes around to tidy up the api namespace.