Re-namespacing a bit to clear out some fairly old stuff from the top level