The apis component client code currently has unnecessary nesting. I.e. there is one extra layer of nesting in the directory structure. As part of the Core component refactoring (pr #1288), I am making changes to the APIs client code, so I will go ahead and move some files up one level.
