Moved package objects into top level