cleaned up the way exports works.  (got rid of namespacing issue)