fixed top level namespace

Fixed the top level namespace.  Possibly hacky solution that should be
reviewed later.