Fix PSR-0 mistakes