Moved the API classes back to the API subproject