restructuring namespacing a little