Merge "Move APIs to final location in preparation for API review"