updated class names for psr-4 loading