moved class for namespacing