Fixed to work with composer. Not full PSR-0 compliance