Changed top level namespace from a class to a module