refactored namespacing of classes