Major PSR-0 problems fixed