Refactor everyone out of the API namespace