made class names and files PSR-0 compliant