Moved to objects for namespacing/modules.