* Change from classmap to psr-0