Fixed PSR-0 issues