Final step in the metadata API restructuring: move the