Reorganizing API files after an Argo mapping fix.