fixed namespaces and class names for psr compliance