Merge "Move api/*current.txt filegroups into api dir"