Merge the admin and api sub-modules

There isn't a compelling reason to keep the admin and api submodules separate any longer.
api depends on admin already and keeping api code out of admin makes it difficult to evolve the vdb structural components into regular api objects - or at least hold resolved references.